LIB001-586: Further fixes to tags and search results

This shouldn't be in branch LIB001-432!