diff --git a/wherehows-web/app/components/dataset-compliance.js b/wherehows-web/app/components/dataset-compliance.js
index d9711747ca..69c96331cb 100644
--- a/wherehows-web/app/components/dataset-compliance.js
+++ b/wherehows-web/app/components/dataset-compliance.js
@@ -179,10 +179,10 @@ export default Component.extend({
    * @return {Boolean|*} Contains or does not
    */
   ensureTypeContainsLogicalType: sourceEntities => {
-    const logicalTypes = logicalTypes.map(type => type.toUpperCase());
+    const logicalTypesInUppercase = logicalTypes.map(type => type.toUpperCase());
 
     return sourceEntities.every(entity =>
-      logicalTypes.includes(get(entity, 'logicalType')));
+      logicalTypesInUppercase.includes(get(entity, 'logicalType')));
   },
 
   actions: {
diff --git a/wherehows-web/app/routes/application.js b/wherehows-web/app/routes/application.js
index b4578411a4..c237ad12eb 100644
--- a/wherehows-web/app/routes/application.js
+++ b/wherehows-web/app/routes/application.js
@@ -49,8 +49,8 @@ export default Route.extend(ApplicationRouteMixin, {
   },
 
   processLegacyDomOperations() {
-    window.legacySearch();
     // TODO: DSS-6122 Refactor Remove tree legacy operations & references
+    // window.legacySearch();
     // window.legacyTree();
     window.legacyMain();
   }
diff --git a/wherehows-web/app/styles/components/_navbar.scss b/wherehows-web/app/styles/components/_navbar.scss
index 947890d437..bfb99b6d06 100644
--- a/wherehows-web/app/styles/components/_navbar.scss
+++ b/wherehows-web/app/styles/components/_navbar.scss
@@ -54,3 +54,14 @@
 .action-bar {
   margin-bottom: 20px;
 }
+
+/**
+ * Styles a container list of navigation items
+ */
+.tabbed-navigation-list {
+  white-space: nowrap;
+
+  &--tab {
+    border-radius: 0;
+  }
+}
diff --git a/wherehows-web/app/utils/datasets/functions.js b/wherehows-web/app/utils/datasets/functions.js
index 15c94cbac8..b971626b90 100644
--- a/wherehows-web/app/utils/datasets/functions.js
+++ b/wherehows-web/app/utils/datasets/functions.js
@@ -2,10 +2,9 @@
  * Builds a privacyCompliancePolicy map with default / unset values for non null properties
  */
 export const createPrivacyCompliancePolicy = () => {
-  const complianceTypes = ['AUTO_PURGE', 'CUSTOM_PURGE', 'LIMITED_RETENTION', 'PURGE_NOT_APPLICABLE'];
   const policy = {
     // default to first item in compliance types list
-    complianceType: complianceTypes.get('firstObject'),
+    complianceType: 'AUTO_PURGE',
     compliancePurgeEntities: []
   };
 
@@ -33,4 +32,4 @@ export const createSecuritySpecification = id => {
     };
 
     return JSON.parse(JSON.stringify(securitySpecification));
-  };
\ No newline at end of file
+  };