Revert "Revert "Reset fields when no selected on save""

Reverts ministryofjustice/atet#290