Fixing the Apply button action enhancement should work now. Also
refactored little bit of ModelCreator (I should really rename this
file)...