fix for search bugs