Merge "Update searchHint"