LIB001-432: Further quick fixes
LIB001-432: Further corrections to tag styling