bug fixes + support for Disabled field by default