Merge "Add button to remove saved search query"