Let's get rid ofconstraints with text fields of country and states used as relation with the zones of data sources WIP: #61