revise recent changes to reinstate consistency
Merge pull request #728 from alphagov/arrested_abroad_reset

Refactoring recent changes to arrested abroad smart-answer