Updated favorite form to use country/region wording. fixes #21