Updates to catalog views

Remaining issues from previous pull request and upgrades to catalog views.
Not sure if needed, but I think you should stop all `Deps.autorun` you create, when they are not needed anymore.