[#703 Wizard] Fix mapping for categorical units