[JBIDe-14459] switched embedding wizard, fixed cartridge sorting