FYI - I refactored the code so that it now enforces "return_from_same_city". enjoy.