MOB-804, hide hidden categories from view

For code review only, do not merge!