Fix barcode searching and uid