Updates to catalog views

Remaining issues from previous pull request and upgrades to catalog views.
Why are you using `annotationIdPath` and not `Handlebars.registerHelper 'annotationPathFromId'`? `annotationPathFromId` is much smarter in creating URLs. Not sure if you can call helper directly from non-template, but try to do it, or define a global function available in the code, which has a template helper with same name.