[642] Cleanup search call in API