barcode and hotkeys fixes again