LIB001-586: Further fixes to tags and search results
Merge pull request #66 from ianthe/LIB001-432

LIB001-586: Further fixes to tags and search results