fixed some search issues