Updates to catalog views

Remaining issues from previous pull request and upgrades to catalog views.
`equals` is better performance wise because it triggers rerun only when value changes to or from `true`, while `get` trigger every time (for example, if value would change from `null` to `false` and back). I do not think it matters in our case though.