fix some search problems