Fix search issues