fixing search issues