Added ability to hide empty items