Rework URLs - still changes needed
Add page-level caching for metrics
Merge branch 'master' into new_indexing