Fix white space issue for search