Fix missing rows in page templates
Merge branch 'develop' into feature/combined-search-add