Add support for name fields
Make sure name0 (country name) is getting pulled into the query