[PR] Location should be hierarchical for easier selection