Fixed the category entity manager to only return real categories.
added further filter validation and fixed button text and functionality
Updates to filter validation
fixed filter validation
Merge branch 'dev' into feature/EventHoverData