diff --git a/projects/ziti-console-lib/src/lib/features/projectable-forms/service/simple-service/simple-service.component.html b/projects/ziti-console-lib/src/lib/features/projectable-forms/service/simple-service/simple-service.component.html
index 78aa1fa0..4f5ace35 100644
--- a/projects/ziti-console-lib/src/lib/features/projectable-forms/service/simple-service/simple-service.component.html
+++ b/projects/ziti-console-lib/src/lib/features/projectable-forms/service/simple-service/simple-service.component.html
@@ -50,7 +50,7 @@
             <div class="form-group-row">
                 <lib-form-field-container
                         [title]="'ACCESSING CONFIGURATION'"
-                        [contentStyle]="'z-index: 99999999'"
+                        [contentStyle]="'z-index: 10001'"
                         [helpText]="'How will client applications use this service? Specify a hostname/IP and port, or use the &quot;SDK Only&quot; toggle for an application embedded configuration.'"
                 >
                     <div class="form-field-input-group accessing-group">
@@ -117,7 +117,7 @@
                 </lib-form-field-container>
                 <lib-form-field-container
                         [title]="'HOSTING CONFIGURATION'"
-                        [contentStyle]="'z-index: 99999999'"
+                        [contentStyle]="'z-index: 10000'"
                         [helpText]="'Where should traffic for this service be sent? Specify a protocol, hostname/IP, and port, or use the &quot;SDK Only&quot; toggle for an application embedded configuration.'"
 
                 >
diff --git a/projects/ziti-console-lib/src/lib/features/projectable-forms/service/simple-service/simple-service.component.ts b/projects/ziti-console-lib/src/lib/features/projectable-forms/service/simple-service/simple-service.component.ts
index b06c3c0e..d865e52d 100644
--- a/projects/ziti-console-lib/src/lib/features/projectable-forms/service/simple-service/simple-service.component.ts
+++ b/projects/ziti-console-lib/src/lib/features/projectable-forms/service/simple-service/simple-service.component.ts
@@ -168,6 +168,9 @@ export class SimpleServiceComponent extends ProjectableForm {
     this.servicesPageService.getServiceRoleAttributes().then((result) => {
       this.serviceRoleAttributes = result.data;
     });
+    this.servicesPageService.getIdentityRoleAttributes().then((result) => {
+      this.identityRoleAttributes = result.data;
+    });
   }
 
   getIdentityNamedAttributes(filter?) {
@@ -382,6 +385,8 @@ export class SimpleServiceComponent extends ProjectableForm {
       } else if (result === 'cancel') {
         /// Do nothing, stay on page
       } else {
+        this.initDataModels();
+        this._dataChange = false;
         this.router?.navigateByUrl(`${this.basePath}`);
       }
     });
@@ -752,6 +757,14 @@ export class SimpleServiceComponent extends ProjectableForm {
       --data-raw '${JSON.stringify(this.bindPolicyApiData)}' \\`;
   }
 
+  initDataModels() {
+    this.serviceApiData = this.initServiceApiData;
+    this.interceptConfigApiData.data = this.initInterceptConfigApiData.data;
+    this.hostConfigApiData.data = this.initHostConfigApiData.data;
+    this.dialPolicyApiData = this.initDialPolicyApiData;
+    this.bindPolicyApiData = this.initBindPolicyApiData;
+  }
+
   override checkDataChange() {
     const serviceDataChange = !isEqual(this.initServiceApiData, this.serviceApiData);
     const interceptDataChange = !isEqual(this.initInterceptConfigApiData.data, this.interceptConfigApiData.data);
diff --git a/projects/ziti-console-lib/src/lib/features/tag-selector/tag-selector.component.scss b/projects/ziti-console-lib/src/lib/features/tag-selector/tag-selector.component.scss
index 5f7a93a4..cdba705b 100644
--- a/projects/ziti-console-lib/src/lib/features/tag-selector/tag-selector.component.scss
+++ b/projects/ziti-console-lib/src/lib/features/tag-selector/tag-selector.component.scss
@@ -538,3 +538,9 @@ input {
   -webkit-animation: loading 0.5s infinite linear;
   animation: loading 0.5s infinite linear;
 }
+
+.tagsSelector {
+  &.clickOutside {
+    position: relative;
+  }
+}
\ No newline at end of file