Bugfix + sites map in diagram