A2 Caravan Traveling Annoyance/Bug?

In Act 2, if you use the desert map to go to a location (like Keth) and then change your mind and click it again to choose another location (like the Mastodon Badlands) the caravan exit door will still say Keth (and be Keth). If you absent-mindedly click the door to enter you will go to Keth and not the Badlands.

Then, once in the new zone, if you click the door to re-enter the caravan you start at the waypoint and the door to the area you just left is closed (so you have to go back to the desert map and travel again).

Furthermore, in general, is it intended to always return to the waypoint area even though it is expected to appear in the desert map area of the caravan? For example, when visiting the Halani Gates for the first time, you leave the map area and go talk to the Sekhema only to run back or port back to the caravan...only to end up at the waypoint, even though the natural, next immediate action is to run back to the desert map to travel to the Mawdun mines.