Fixing links to the running instances
Aligning with updates from upstream IDM changes
Adding correlation queries for both mappings