[company configurator fix and code picker update]