[5453] Allowing to hide stats
[5453] Improved code