review fixes relating to search and caching