Fixed search controller + added search functions to api service