Updates to catalog views

Remaining issues from previous pull request and upgrades to catalog views.
Interesting, you are using `equals`, elsewhere in the code we are using `get`. Probably we should harmonize this.