Refactor pluralized translation helpers
Clean up and refactor some stuff in SearchController