Improved home search.