MLDS-04 moving more range generator
MLDS-02 Fixing null types when auto saving