[#108] Re-order location sub-elements