Track / Configuration model doesn't map well to the game UI

The default "Group By Location" in-game actually groups by location / city. Most of the time the city is a prefix of the name of the circuit, but not always. For example under Granja Viana we have both "Copa Sao Paulo Kart Stage 2" (note the complete lack of "Granja Viana" in the track name) and "Granja Viana Kart 101". Unfortunately this means the current Track / Configuration setup we have is basically broken. By "broken" I mean that from "Copa Sao Paulo Kart Stage 2" there's no way in the game to find out that it's hidden under "Granja Viana".

My best idea is to transition to a Location / Configuration setup.