Rename of category legend to filters/facets
Refactoring search controller for readability