Changes to fix some search results display issues