Add layers with multiple location fields to maps

I have a database with “Routes” that contains 2 location fields, “A” and “B”. I want to track my travel kilometers for work and since most is spent on a few routes I often take I made this route database. I want to put these routes on the Map, but I can only select Routes once as a map item.

Fibery detects correctly that I already added “Routes” as a map item once but it would be great if it could detect that I a map layer has another location field and it makes it possible to add it again and then you can select the other location field.

Edit: I do like how I can visualize multiple location fields in the entity view. Would of course also be nice to also add one map here with both locations, but this is less important for me.