Review fixes
Merge pull request #218 from kubked/sn-or-barcode-review

SN or barcode review fixes