Update to smaller regex to allow for '-' and ':' in tags, update printshiv as well.