re #750 - Improved migration
re #750 - Sync category with page
Merge branch 'feature/750-results' into staging