Tags Fix barcode issues

Tag: fix barcode issues