Updates to catalog views

Remaining issues from previous pull request and upgrades to catalog views.
This is an old inconsistency (groups was my first code to the project, and I'm pretty sure I copied the equals from somewhere else — it seems from admin code :)). I'll open a ticket so it gets done for all cases in a separate pull request.