Minor improvements.
Reduce requests made to search.
Fix issues with async requests.