Working on the Search Endpoint