fix search issues