Changed to disable fields not specifically enabled