refactor(enable/disable): harmonize handling of disabled fields