Clicking on the search 'tagbox' clears the search.
Merge remote-tracking branch 'origin/master'
Re-applied some useful changes from the earlier reversed commit.