More URI fixes. In views, mainly. Plus a bit of simplification of dead code in the service