some search string logic added