I've added 'hide empty category' option in my local version, maybe you want to include that? I could push it to development?