First pass at category search
Slight code cleanup
Fix paging for category search
Clean up of region search (not functional)