diff --git a/src/mocks/fixtures/Jobs.json b/src/mocks/fixtures/Jobs.json
index a0316bc44a7c7d6f826aad0c4ded559f107b57bf..cacb207dc70d56572a426d0aefa863835c114fdc 100644
--- a/src/mocks/fixtures/Jobs.json
+++ b/src/mocks/fixtures/Jobs.json
@@ -21,6 +21,7 @@
       "gitShortReference": "5d102879",
       "host": {
         "hostId": "MTUyX3RydWU=",
+        "externalIdValid": true,
         "hostName": "ccce-test-ioc-02",
         "network": "CSLab-GeneralLab",
         "fqdn": "ccce-test-ioc-02.cslab.esss.lu.se",
@@ -72,6 +73,7 @@
       "gitShortReference": "0a5b165b",
       "host": {
         "hostId": "MTUxX3RydWU=",
+        "externalIdValid": true,
         "hostName": "ccce-test-ioc-01",
         "network": "CSLab-GeneralLab",
         "fqdn": "ccce-test-ioc-01.cslab.esss.lu.se",
@@ -122,6 +124,7 @@
       "gitShortReference": "525c1a89",
       "host": {
         "hostId": "MTUxX3RydWU=",
+        "externalIdValid": true,
         "hostName": "ccce-test-ioc-01",
         "network": "CSLab-GeneralLab",
         "fqdn": "ccce-test-ioc-01.cslab.esss.lu.se",
@@ -177,6 +180,7 @@
           "gitReference": "0a5b165b7c80e43d1b29ca1aa31fa2861d5536dc",
           "host": {
             "hostId": "MTUxX3RydWU=",
+            "externalIdValid": true,
             "hostName": "ccce-test-ioc-01",
             "network": "CSLab-GeneralLab",
             "fqdn": "ccce-test-ioc-01.cslab.esss.lu.se",
@@ -190,6 +194,7 @@
           "gitReference": "engineer_set",
           "host": {
             "hostId": "MTUxX3RydWU=",
+            "externalIdValid": true,
             "hostName": "ccce-test-ioc-01",
             "network": "CSLab-GeneralLab",
             "fqdn": "ccce-test-ioc-01.cslab.esss.lu.se",
@@ -241,6 +246,7 @@
           "gitReference": "engineer_set",
           "host": {
             "hostId": "MTUyX3RydWU=",
+            "externalIdValid": true,
             "hostName": "ccce-test-ioc-56-test",
             "network": "CSLab-GeneralLab",
             "fqdn": "ccce-test-ioc-02.test1",
@@ -254,6 +260,7 @@
           "gitReference": "engineer_set",
           "host": {
             "hostId": "MTUyX3RydWU=",
+            "externalIdValid": true,
             "hostName": "ccce-test-ioc-56-test",
             "network": "CSLab-GeneralLab",
             "fqdn": "ccce-test-ioc-02.test1",
@@ -262,11 +269,12 @@
         },
         {
           "iocId": 3731,
-          "iocName": "MOCK:TEST-89",
+          "iocName": "MOCK:TEST-16",
           "gitProjectId": 595959,
           "gitReference": "engineer_set",
           "host": {
             "hostId": "MTUyX3RydWU=",
+            "externalIdValid": true,
             "hostName": "ccce-test-ioc-56-test",
             "network": "CSLab-GeneralLab",
             "fqdn": "ccce-test-ioc-02.test1",
@@ -280,6 +288,7 @@
           "gitReference": "engineer_set",
           "host": {
             "hostId": "AnotherHost",
+            "externalIdValid": true,
             "hostName": "ccce-test-ioc-test",
             "network": "CSLab-GeneralLab",
             "fqdn": "AnotherHost.fqdn",
@@ -325,6 +334,7 @@
       "gitShortReference": "a278b61c",
       "host": {
         "hostId": "MTUxX3RydWU=",
+        "externalIdValid": true,
         "hostName": "ccce-test-ioc-01",
         "network": "CSLab-GeneralLab",
         "fqdn": "ccce-test-ioc-01.cslab.esss.lu.se",
@@ -376,6 +386,7 @@
       "gitShortReference": "4567a397",
       "host": {
         "hostId": "MTUyX3RydWU=",
+        "externalIdValid": true,
         "hostName": "ccce-test-ioc-02",
         "network": "CSLab-GeneralLab",
         "fqdn": "ccce-test-ioc-02.cslab.esss.lu.se",
@@ -426,6 +437,7 @@
       "gitShortReference": "4567a397",
       "host": {
         "hostId": "MTUxX3RydWU=",
+        "externalIdValid": true,
         "hostName": "ccce-test-ioc-01",
         "network": "CSLab-GeneralLab",
         "fqdn": "ccce-test-ioc-01.cslab.esss.lu.se",
@@ -476,6 +488,7 @@
       "gitShortReference": "a278b61c",
       "host": {
         "hostId": "MTUxX3RydWU=",
+        "externalIdValid": true,
         "hostName": "ccce-test-ioc-01",
         "network": "CSLab-GeneralLab",
         "fqdn": "ccce-test-ioc-01.cslab.esss.lu.se",
@@ -527,6 +540,7 @@
       "gitShortReference": "5d102879",
       "host": {
         "hostId": "MTUxX3RydWU=",
+        "externalIdValid": true,
         "hostName": "ccce-test-ioc-01",
         "network": "CSLab-GeneralLab",
         "fqdn": "ccce-test-ioc-01.cslab.esss.lu.se",
@@ -578,6 +592,7 @@
       "gitShortReference": "5d102879",
       "host": {
         "hostId": "MTUxX3RydWU=",
+        "externalIdValid": true,
         "hostName": "ccce-test-ioc-01",
         "network": "CSLab-GeneralLab",
         "fqdn": "ccce-test-ioc-01.cslab.esss.lu.se",
@@ -629,6 +644,7 @@
       "gitShortReference": "5d102879",
       "host": {
         "hostId": "MTUyX3RydWU=",
+        "externalIdValid": true,
         "hostName": "ccce-test-ioc-02",
         "network": "CSLab-GeneralLab",
         "fqdn": "ccce-test-ioc-02.cslab.esss.lu.se",
@@ -680,6 +696,7 @@
       "gitShortReference": "5d102879",
       "host": {
         "hostId": "MTUyX3RydWU=",
+        "externalIdValid": true,
         "hostName": "ccce-test-ioc-02",
         "network": "CSLab-GeneralLab",
         "fqdn": "ccce-test-ioc-02.cslab.esss.lu.se",
@@ -731,6 +748,7 @@
       "gitShortReference": "5d102879",
       "host": {
         "hostId": "MTUyX3RydWU=",
+        "externalIdValid": true,
         "hostName": "ccce-test-ioc-02",
         "network": "CSLab-GeneralLab",
         "fqdn": "ccce-test-ioc-02.cslab.esss.lu.se",
@@ -772,6 +790,7 @@
       "gitShortReference": "5d102879",
       "host": {
         "hostId": "MTUyX3RydWU=",
+        "externalIdValid": true,
         "hostName": "ccce-test-ioc-02",
         "network": "CSLab-GeneralLab",
         "fqdn": "ccce-test-ioc-02.cslab.esss.lu.se",
@@ -817,6 +836,7 @@
       "gitShortReference": "5d102879",
       "host": {
         "hostId": "MTUxX3RydWU=",
+        "externalIdValid": true,
         "hostName": "ccce-test-ioc-01",
         "network": "CSLab-GeneralLab",
         "fqdn": "ccce-test-ioc-01.cslab.esss.lu.se",
@@ -852,6 +872,7 @@
       "gitShortReference": "5d102879",
       "host": {
         "hostId": "MTUxX3RydWU=",
+        "externalIdValid": true,
         "hostName": "ccce-test-ioc-01",
         "network": "CSLab-GeneralLab",
         "fqdn": "ccce-test-ioc-01.cslab.esss.lu.se",
@@ -897,6 +918,7 @@
       "gitShortReference": "5d102879",
       "host": {
         "hostId": "MTUyX3RydWU=",
+        "externalIdValid": true,
         "hostName": "ccce-test-ioc-02",
         "network": "CSLab-GeneralLab",
         "fqdn": "ccce-test-ioc-02.cslab.esss.lu.se",
@@ -932,6 +954,7 @@
       "gitShortReference": "5d102879",
       "host": {
         "hostId": "MTUyX3RydWU=",
+        "externalIdValid": true,
         "hostName": "ccce-test-ioc-02",
         "network": "CSLab-GeneralLab",
         "fqdn": "ccce-test-ioc-02.cslab.esss.lu.se",
@@ -966,6 +989,7 @@
       "gitShortReference": "5d102879",
       "host": {
         "hostId": "MTUyX3RydWU=",
+        "externalIdValid": true,
         "hostName": "ccce-test-ioc-02",
         "network": "CSLab-GeneralLab",
         "fqdn": "ccce-test-ioc-02.cslab.esss.lu.se",