some changes for general search. check in for Pranav