Fix disabled fields appearing in results or blocking submission when required