Added option to hide empty badges