Bug fixes
Working on hiding empty groups