Fixes for top search.