diff --git a/zmsadmin/src/Zmsadmin/Helper/GraphDefaults.php b/zmsadmin/src/Zmsadmin/Helper/GraphDefaults.php
index db3b93627..3526312cb 100644
--- a/zmsadmin/src/Zmsadmin/Helper/GraphDefaults.php
+++ b/zmsadmin/src/Zmsadmin/Helper/GraphDefaults.php
@@ -152,7 +152,6 @@ public static function getDepartment()
         return static::defaultFormat($default);
     }
 
-
     /**
      * requests reduced response data
      */
diff --git a/zmsadmin/tests/Zmsadmin/AppointmentFormFreeProcessListTest.php b/zmsadmin/tests/Zmsadmin/AppointmentFormFreeProcessListTest.php
index 319ba2e94..56d57d444 100644
--- a/zmsadmin/tests/Zmsadmin/AppointmentFormFreeProcessListTest.php
+++ b/zmsadmin/tests/Zmsadmin/AppointmentFormFreeProcessListTest.php
@@ -89,7 +89,7 @@ public function testWithSelectedProcessChangedDate()
                     'function' => 'readGetResult',
                     'url' => '/scope/141/',
                     'parameters' => [
-                        'resolveReferences' => 1,
+                        'resolveReferences' => 2,
                         'gql' => \BO\Zmsadmin\Helper\GraphDefaults::getScope()
                     ],
                     'response' => $this->readFixture("GET_scope_141.json")
@@ -140,7 +140,7 @@ public function testWithSelectedProcess()
                     'function' => 'readGetResult',
                     'url' => '/scope/141/',
                     'parameters' => [
-                        'resolveReferences' => 1,
+                        'resolveReferences' => 2,
                         'gql' => \BO\Zmsadmin\Helper\GraphDefaults::getScope()
                     ],
                     'response' => $this->readFixture("GET_scope_141.json")
diff --git a/zmsadmin/tests/Zmsadmin/AppointmentFormTest.php b/zmsadmin/tests/Zmsadmin/AppointmentFormTest.php
index 41e137b4f..4cd19da1f 100644
--- a/zmsadmin/tests/Zmsadmin/AppointmentFormTest.php
+++ b/zmsadmin/tests/Zmsadmin/AppointmentFormTest.php
@@ -143,7 +143,7 @@ public function testClusterEnabledWithSelectedScope()
                     'function' => 'readGetResult',
                     'url' => '/scope/141/',
                     'parameters' => [
-                        'resolveReferences' => 1,
+                        'resolveReferences' => 2,
                         'gql' => \BO\Zmsadmin\Helper\GraphDefaults::getScope()
                     ],
                     'response' => $this->readFixture("GET_scope_141.json")
@@ -312,7 +312,7 @@ public function testWithSlotsRequired()
                     'function' => 'readGetResult',
                     'url' => '/scope/141/',
                     'parameters' => [
-                        'resolveReferences' => 1,
+                        'resolveReferences' => 2,
                         'gql' => \BO\Zmsadmin\Helper\GraphDefaults::getScope()
                     ],
                     'response' => $this->readFixture("GET_scope_141_multipleSlotsEnabled.json")
diff --git a/zmsadmin/tests/Zmsadmin/CalendarPageTest.php b/zmsadmin/tests/Zmsadmin/CalendarPageTest.php
index 0b9ff91c6..3cfc13bda 100644
--- a/zmsadmin/tests/Zmsadmin/CalendarPageTest.php
+++ b/zmsadmin/tests/Zmsadmin/CalendarPageTest.php
@@ -62,7 +62,7 @@ public function testWithSelectedScope()
                     'function' => 'readGetResult',
                     'url' => '/scope/141/',
                     'parameters' => [
-                        'resolveReferences' => 1,
+                        'resolveReferences' => 2,
                         'gql' => \BO\Zmsadmin\Helper\GraphDefaults::getScope()
                     ],
                     'response' => $this->readFixture("GET_scope_141.json")
diff --git a/zmsadmin/tests/Zmsadmin/ProcessReserveTest.php b/zmsadmin/tests/Zmsadmin/ProcessReserveTest.php
index f81dedb45..d2edc1fec 100644
--- a/zmsadmin/tests/Zmsadmin/ProcessReserveTest.php
+++ b/zmsadmin/tests/Zmsadmin/ProcessReserveTest.php
@@ -40,7 +40,7 @@ public function testRendering()
                     'function' => 'readGetResult',
                     'url' => '/scope/141/',
                     'parameters' => [
-                        'resolveReferences' => 1,
+                        'resolveReferences' => 2,
                         'gql' => \BO\Zmsadmin\Helper\GraphDefaults::getScope()
                     ],
                     'response' => $this->readFixture("GET_scope_141.json")
@@ -90,7 +90,7 @@ public function testWithConflicts()
                     'function' => 'readGetResult',
                     'url' => '/scope/141/',
                     'parameters' => [
-                        'resolveReferences' => 1,
+                        'resolveReferences' => 2,
                         'gql' => \BO\Zmsadmin\Helper\GraphDefaults::getScope()
                     ],
                     'response' => $this->readFixture("GET_scope_141.json")
@@ -146,7 +146,7 @@ public function testReserveCopy()
                     'function' => 'readGetResult',
                     'url' => '/scope/141/',
                     'parameters' => [
-                        'resolveReferences' => 1,
+                        'resolveReferences' => 2,
                         'gql' => \BO\Zmsadmin\Helper\GraphDefaults::getScope()
                     ],
                     'response' => $this->readFixture("GET_scope_141.json")
@@ -196,7 +196,7 @@ public function testWithConfirmations()
                     'function' => 'readGetResult',
                     'url' => '/scope/141/',
                     'parameters' => [
-                        'resolveReferences' => 1,
+                        'resolveReferences' => 2,
                         'gql' => \BO\Zmsadmin\Helper\GraphDefaults::getScope()
                     ],
                     'response' => $this->readFixture("GET_scope_141.json")
@@ -260,7 +260,7 @@ public function testWithManualSlotCount()
                     'function' => 'readGetResult',
                     'url' => '/scope/141/',
                     'parameters' => [
-                        'resolveReferences' => 1,
+                        'resolveReferences' => 2,
                         'gql' => \BO\Zmsadmin\Helper\GraphDefaults::getScope()
                     ],
                     'response' => $this->readFixture("GET_scope_141.json")
@@ -302,7 +302,7 @@ public function testWithRequiredMail()
                     'function' => 'readGetResult',
                     'url' => '/scope/141/',
                     'parameters' => [
-                        'resolveReferences' => 1,
+                        'resolveReferences' => 2,
                         'gql' => \BO\Zmsadmin\Helper\GraphDefaults::getScope()
                     ],
                     'response' => $this->readFixture("GET_scope_141_required_mail.json")
@@ -346,7 +346,7 @@ public function testValidationFailed()
                     'function' => 'readGetResult',
                     'url' => '/scope/141/',
                     'parameters' => [
-                        'resolveReferences' => 1,
+                        'resolveReferences' => 2,
                         'gql' => \BO\Zmsadmin\Helper\GraphDefaults::getScope()
                     ],
                     'response' => $this->readFixture("GET_scope_141.json")
diff --git a/zmsadmin/tests/Zmsadmin/ProcessSaveTest.php b/zmsadmin/tests/Zmsadmin/ProcessSaveTest.php
index 70d0fd3da..4a4832157 100644
--- a/zmsadmin/tests/Zmsadmin/ProcessSaveTest.php
+++ b/zmsadmin/tests/Zmsadmin/ProcessSaveTest.php
@@ -39,7 +39,7 @@ public function testRendering()
                     'function' => 'readGetResult',
                     'url' => '/scope/141/',
                     'parameters' => [
-                        'resolveReferences' => 1,
+                        'resolveReferences' => 2,
                         'gql' => \BO\Zmsadmin\Helper\GraphDefaults::getScope()
                     ],
                     'response' => $this->readFixture("GET_scope_141.json")
@@ -92,7 +92,7 @@ public function testWithConflictOverbookedSlots()
                     'function' => 'readGetResult',
                     'url' => '/scope/141/',
                     'parameters' => [
-                        'resolveReferences' => 1,
+                        'resolveReferences' => 2,
                         'gql' => \BO\Zmsadmin\Helper\GraphDefaults::getScope()
                     ],
                     'response' => $this->readFixture("GET_scope_141.json")
@@ -150,7 +150,7 @@ public function testWithConflictOutOfAvailability()
                     'function' => 'readGetResult',
                     'url' => '/scope/141/',
                     'parameters' => [
-                        'resolveReferences' => 1,
+                        'resolveReferences' => 2,
                         'gql' => \BO\Zmsadmin\Helper\GraphDefaults::getScope()
                     ],
                     'response' => $this->readFixture("GET_scope_141.json")
@@ -208,7 +208,7 @@ public function testWithQueuedProcess()
                     'function' => 'readGetResult',
                     'url' => '/scope/141/',
                     'parameters' => [
-                        'resolveReferences' => 1,
+                        'resolveReferences' => 2,
                         'gql' => \BO\Zmsadmin\Helper\GraphDefaults::getScope()
                     ],
                     'response' => $this->readFixture("GET_scope_141.json")
@@ -252,7 +252,7 @@ public function testValidationFailed()
                     'function' => 'readGetResult',
                     'url' => '/scope/141/',
                     'parameters' => [
-                        'resolveReferences' => 1,
+                        'resolveReferences' => 2,
                         'gql' => \BO\Zmsadmin\Helper\GraphDefaults::getScope()
                     ],
                     'response' => $this->readFixture("GET_scope_141.json")