Small fix: don't forget remote_hash if no choice is done in list