CR round 1 for new Search Suggestion