[api2] Improve search results