1.correct , that's best way to approach . let's put only one for the same region . if the region moved , them let's move it accordingly. so, please delete old option and insert where it's moved now in hierarchy . 2. please submit when ready . it's not related to release , we can update it separately