More tweaks and rationalisation of routing/urls
Merge branch 'master' into new_indexing