Creating shortcuts if they were present on the saved diagram, improved generation of relationships, fix #49