"Where are you from" and "where do you live now" are different questions. The first of these has multiple answers for a lot of people I know; the second probably doesn't. I would suggest both questions be asked next year.