simpler category code
Merge branch 'search-multiple-categories'