more fixes for barcode layout CRM-12967