YH-360: Cleaned up search results