Finishing Search endpoint before some bigger refactoring in HandlerFactory
Tidy up