New catalogue/search endpoint
Refactoring