fixed search issues