Fixing few things related to search.