Add CITIES data structure to search model
Add tentative CATEGORIES constant
Testing tweaks
Add tests for search creation
Cleanup
Tests passing; index/new working