Swap branch and location

Following pattern established in the other features where branch always
comes before location if both are present