diff --git a/components/Tabbed/index.vue b/components/Tabbed/index.vue
index 31558be77d..d575339a4f 100644
--- a/components/Tabbed/index.vue
+++ b/components/Tabbed/index.vue
@@ -38,6 +38,11 @@ export default {
     scrollOnChange: {
       type:    Boolean,
       default: false
+    },
+
+    tabsUseHistoryReplace: {
+      type:    Boolean,
+      default: true,
     }
   },
 
@@ -168,7 +173,11 @@ export default {
     select(name/* , event */) {
       const {
         sortedTabs,
-        $route: { hash: routeHash },
+        tabsUseHistoryReplace,
+        $route: {
+          hash: routeHash,
+          fullPath
+        },
       } = this;
 
       const selected = this.find(name);
@@ -183,7 +192,13 @@ export default {
       }
 
       if (routeHash !== hashName) {
-        window.location.hash = `#${ name }`;
+        if (tabsUseHistoryReplace) {
+          const fullPathWOHash = fullPath.includes('#') ? fullPath.split('#')[0] : fullPath;
+
+          window.history.replaceState(null, '', `${ fullPathWOHash }#${ name }`);
+        } else {
+          window.location.hash = `#${ name }`;
+        }
       }
 
       for ( const tab of sortedTabs ) {
diff --git a/components/form/ServicePorts.vue b/components/form/ServicePorts.vue
index 56601043b2..e78c29fbf8 100644
--- a/components/form/ServicePorts.vue
+++ b/components/form/ServicePorts.vue
@@ -125,7 +125,7 @@ export default {
           <th v-if="specType !== 'NodePort'" class="port-protocol">
             <t k="servicePorts.rules.protocol.label" />
           </th>
-          <th v-if="specType !== 'Headless'" class="target-port">
+          <th class="target-port">
             <t k="servicePorts.rules.target.label" />
           </th>
           <th v-if="specType === 'NodePort' || specType === 'LoadBalancer'" class="node-port">
@@ -173,7 +173,7 @@ export default {
               @input="queueUpdate"
             />
           </td>
-          <td v-if="specType !== 'Headless'" class="target-port">
+          <td class="target-port">
             <span v-if="isView">{{ row.targetPort }}</span>
             <input
               v-else
diff --git a/edit/service.vue b/edit/service.vue
index 0f7d1629ab..c7f8c26e03 100644
--- a/edit/service.vue
+++ b/edit/service.vue
@@ -204,7 +204,7 @@ export default {
             </div>
           </div>
         </Tab>
-        <Tab v-else name="define-external-name" :label="t('servicesPage.ips.define')">
+        <Tab v-else name="define-service-ports" :label="t('servicesPage.ips.define')">
           <ServicePorts
             v-model="value.spec.ports"
             class="col span-12"
@@ -325,7 +325,7 @@ export default {
           <div class="row labels-row">
             <Labels
               :default-container-class="'labels-and-annotations-container'"
-              :value="value.spec"
+              :value="value"
               :mode="mode"
               :display-side-by-side="false"
             />