How about adding sub-locations? So the AI can use location-connection.
This has been added for awhile. Drag a location underneath and to the right of another location to set it as a sublocation. If location change is enabled in the settings, the AI can move to the location for you automatically