Remove type from barcode query to optimise it