diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d515564a..08f4c7291 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ v0.9.6-dev (June XX, 2021)
 **Data changes**
 
 * Set all `StatementTypeEnum.<LABEL>.value` to `StatementTypeEnum.<LABEL>.name` in order for relevant label/term to show up in Django database admin interface.
+* Create baselines for CMMC catalog.
 * Fisma impact level is now represented as Security Sensitivity level following OSCAL's schema.
 
 
diff --git a/controls/data/baselines/CMMC_ver1_baselines.json b/controls/data/baselines/CMMC_ver1_baselines.json
new file mode 100644
index 000000000..3cd9db8e5
--- /dev/null
+++ b/controls/data/baselines/CMMC_ver1_baselines.json
@@ -0,0 +1,22 @@
+{
+    "level 1" : {
+        "controls":
+            ["ac.1.001", "ac.1.002", "ac.1.003", "ac.1.004", "ia.1.076", "ia.1.077", "mp.1.118", "pe.1.131", "pe.1.132", "pe.1.133", "pe.1.134", "sc.1.175", "sc.1.176", "si.1.210", "si.1.211", "si.1.212", "si.1.213"]
+        },
+    "level 2" : {
+        "controls":
+            ["ac.1.001", "ac.2.005", "ac.2.006", "ac.1.002", "ac.2.007", "ac.2.008", "ac.2.009", "ac.2.010", "ac.2.011", "ac.2.013", "ac.2.015", "ac.1.003", "ac.2.016", "ac.1.004", "au.2.041", "au.2.042", "au.2.043", "au.2.044", "at.2.056", "at.2.057", "cm.2.061", "cm.2.062", "cm.2.063", "cm.2.064", "cm.2.065", "cm.2.066", "ia.1.076", "ia.2.078", "ia.1.077", "ia.2.079", "ia.2.080", "ia.2.081", "ia.2.082", "ir.2.092", "ir.2.093", "ir.2.094", "ir.2.096", "ir.2.097", "ma.2.111", "ma.2.112", "ma.2.113", "ma.2.114", "mp.2.119", "mp.2.120", "mp.2.121", "mp.1.118", "ps.2.127", "ps.2.128", "pe.1.131", "pe.2.135", "pe.1.132", "pe.1.133", "pe.1.134", "re.2.137", "re.2.138", "rm.2.141", "rm.2.142", "ca.2.157", "ca.2.158", "ca.2.159", "sc.2.178", "sc.2.179", "sc.1.175", "sc.1.176", "si.1.210", "si.2.214", "si.1.211", "si.1.212", "si.1.213", "si.2.216", "si.2.217", "si.3.220"]
+        },
+    "level 3" : {
+        "controls":
+            ["ac.1.001", "ac.2.005", "ac.2.006", "ac.1.002", "ac.2.007", "ac.3.017", "ac.2.008", "ac.3.018", "ac.2.009", "ac.3.019", "ac.2.010", "ac.3.012", "ac.2.011", "ac.3.020", "ac.2.013", "ac.3.014", "ac.2.015", "ac.3.021", "ac.1.003", "ac.2.016", "ac.3.022", "ac.1.004", "au.2.041", "au.3.045", "au.3.046", "au.2.042", "au.3.048", "au.2.043", "au.3.049", "au.3.050", "au.2.044", "au.3.051", "au.3.052", "at.2.056", "at.3.058", "at.2.057", "cm.2.061", "cm.2.062", "cm.2.063", "cm.2.064", "cm.3.067", "cm.2.065", "cm.3.068", "cm.2.066", "cm.3.069", "ia.1.076", "ia.2.078", "ia.3.083", "ia.1.077", "ia.2.079", "ia.3.084", "ia.2.080", "ia.3.085", "ia.2.081", "ia.3.086", "ia.2.082", "ir.2.092", "ir.2.093", "ir.2.094", "ir.2.096", "ir.3.098", "ir.2.097", "ir.3.099", "ma.2.111", "ma.3.115", "ma.2.112", "ma.3.116", "ma.2.113", "ma.2.114", "mp.3.122", "mp.2.119", "mp.3.123", "mp.2.120", "mp.2.121", "mp.1.118", "mp.3.124", "mp.3.125", "ps.2.127", "ps.2.128", "pe.1.131", "pe.2.135", "pe.3.136", "pe.1.132", "pe.1.133", "pe.1.134", "re.2.137", "re.3.139", "re.2.138", "rm.2.141", "rm.3.144", "rm.2.142", "rm.3.146", "rm.3.147", "ca.2.157", "ca.2.158", "ca.3.161", "ca.2.159", "ca.3.162", "sa.3.169", "sc.2.178", "sc.3.177", "sc.2.179", "sc.3.180", "sc.3.181", "sc.3.182", "sc.3.183", "sc.3.184", "sc.3.185", "sc.3.186", "sc.3.187", "sc.3.188", "sc.3.189", "sc.3.190", "sc.3.191", "sc.1.175", "sc.3.192", "sc.1.176", "sc.3.193", "si.1.210", "si.2.214", "si.1.211", "si.1.212", "si.1.213", "si.2.216", "si.3.218", "si.2.217", "si.3.219", "si.3.220"]
+        },
+    "level 4" : {
+        "controls":
+            ["ac.1.001", "ac.2.005", "ac.2.006", "ac.1.002", "ac.2.007", "ac.3.017", "ac.4.023", "ac.2.008", "ac.3.018", "ac.4.025", "ac.2.009", "ac.3.019", "ac.2.010", "ac.3.012", "ac.2.011", "ac.3.020", "ac.2.013", "ac.3.014", "ac.4.032", "ac.2.015", "ac.3.021", "ac.1.003", "ac.2.016", "ac.3.022", "ac.1.004", "au.2.041", "au.3.045", "au.3.046", "au.2.042", "au.3.048", "au.2.043", "au.3.049", "au.3.050", "au.2.044", "au.3.051", "au.4.053", "au.3.052", "au.4.054", "at.2.056", "at.3.058", "at.4.059", "at.4.060", "at.2.057", "cm.2.061", "cm.2.062", "cm.2.063", "cm.2.064", "cm.3.067", "cm.4.073", "cm.2.065", "cm.3.068", "cm.2.066", "cm.3.069", "ia.1.076", "ia.2.078", "ia.3.083", "ia.1.077", "ia.2.079", "ia.3.084", "ia.2.080", "ia.3.085", "ia.2.081", "ia.3.086", "ia.2.082", "ir.2.092", "ir.4.100", "ir.2.093", "ir.2.094", "ir.2.096", "ir.3.098", "ir.4.101", "ir.2.097", "ir.3.099", "ma.2.111", "ma.3.115", "ma.2.112", "ma.3.116", "ma.2.113", "ma.2.114", "mp.3.122", "mp.2.119", "mp.3.123", "mp.2.120", "mp.2.121", "mp.1.118", "mp.3.124", "mp.3.125", "ps.2.127", "ps.2.128", "pe.1.131", "pe.2.135", "pe.3.136", "pe.1.132", "pe.1.133", "pe.1.134", "re.2.137", "re.3.139", "re.2.138", "rm.2.141", "rm.3.144", "rm.4.149", "rm.2.142", "rm.4.150", "rm.4.151", "rm.3.146", "rm.3.147", "rm.4.148", "ca.2.157", "ca.4.163", "ca.2.158", "ca.3.161", "ca.4.164", "ca.2.159", "ca.4.227", "ca.3.162", "sa.3.169", "sa.4.171", "sa.4.173", "sc.2.178", "sc.3.177", "sc.4.197", "sc.2.179", "sc.3.180", "sc.4.228", "sc.3.181", "sc.3.182", "sc.3.183", "sc.3.184", "sc.3.185", "sc.3.186", "sc.3.187", "sc.3.188", "sc.3.189", "sc.3.190", "sc.3.191", "sc.1.175", "sc.3.192", "sc.4.199", "sc.1.176", "sc.3.193", "sc.4.202", "sc.4.229", "si.1.210", "si.2.214", "si.4.221", "si.1.211", "si.1.212", "si.1.213", "si.2.216", "si.3.218", "si.2.217", "si.3.219", "si.3.220"]
+        },
+    "level 5" : {
+        "controls":
+            ["ac.1.001", "ac.2.005", "ac.2.006", "ac.1.002", "ac.2.007", "ac.3.017", "ac.4.023", "ac.5.024", "ac.2.008", "ac.3.018", "ac.4.025", "ac.2.009", "ac.3.019", "ac.2.010", "ac.3.012", "ac.2.011", "ac.3.020", "ac.2.013", "ac.3.014", "ac.4.032", "ac.2.015", "ac.3.021", "ac.1.003", "ac.2.016", "ac.3.022", "ac.1.004", "au.2.041", "au.3.045", "au.3.046", "au.2.042", "au.3.048", "au.5.055", "au.2.043", "au.3.049", "au.3.050", "au.2.044", "au.3.051", "au.4.053", "au.3.052", "au.4.054", "at.2.056", "at.3.058", "at.4.059", "at.4.060", "at.2.057", "cm.2.061", "cm.2.062", "cm.2.063", "cm.2.064", "cm.3.067", "cm.4.073", "cm.5.074", "cm.2.065", "cm.3.068", "cm.2.066", "cm.3.069", "ia.1.076", "ia.2.078", "ia.3.083", "ia.1.077", "ia.2.079", "ia.3.084", "ia.2.080", "ia.3.085", "ia.2.081", "ia.3.086", "ia.2.082", "ir.2.092", "ir.4.100", "ir.5.106", "ir.2.093", "ir.2.094", "ir.2.096", "ir.3.098", "ir.4.101", "ir.5.102", "ir.5.108", "ir.2.097", "ir.3.099", "ir.5.110", "ma.2.111", "ma.3.115", "ma.2.112", "ma.3.116", "ma.2.113", "ma.2.114", "mp.3.122", "mp.2.119", "mp.3.123", "mp.2.120", "mp.2.121", "mp.1.118", "mp.3.124", "mp.3.125", "ps.2.127", "ps.2.128", "pe.1.131", "pe.2.135", "pe.3.136", "pe.1.132", "pe.1.133", "pe.1.134", "re.2.137", "re.3.139", "re.2.138", "re.5.140", "rm.2.141", "rm.3.144", "rm.4.149", "rm.2.142", "rm.4.150", "rm.4.151", "rm.3.146", "rm.5.152", "rm.3.147", "rm.5.155", "rm.4.148", "ca.2.157", "ca.4.163", "ca.2.158", "ca.3.161", "ca.4.164", "ca.2.159", "ca.4.227", "ca.3.162", "sa.3.169", "sa.4.171", "sa.4.173", "sc.2.178", "sc.3.177", "sc.4.197", "sc.5.198", "sc.2.179", "sc.3.180", "sc.4.228", "sc.5.230", "sc.3.181", "sc.3.182", "sc.3.183", "sc.3.184", "sc.3.185", "sc.3.186", "sc.3.187", "sc.3.188", "sc.3.189", "sc.3.190", "sc.3.191", "sc.1.175", "sc.3.192", "sc.4.199", "sc.5.208", "sc.1.176", "sc.3.193", "sc.4.202", "sc.4.229", "si.1.210", "si.2.214", "si.4.221", "si.1.211", "si.5.222", "si.1.212", "si.1.213", "si.2.216", "si.3.218", "si.5.223", "si.2.217", "si.3.219", "si.3.220"]
+        }
+}
\ No newline at end of file
diff --git a/controls/data/catalogs/CMMC_ver1_catalog.json b/controls/data/catalogs/CMMC_ver1_catalog.json
index d2bae7e8c..74df99896 100644
--- a/controls/data/catalogs/CMMC_ver1_catalog.json
+++ b/controls/data/catalogs/CMMC_ver1_catalog.json
@@ -106,107 +106,107 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/FAR_Clause_52.204-21/b.1.i",
+                                        "href": "/controls/catalogs/FAR_Clause_52.204-21/control/b.1.i",
                                         "rel": "related",
                                         "text": "b.1.i"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.1.1",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.1.1",
                                         "rel": "related",
                                         "text": "3.1.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/1.4",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/1.4",
                                         "rel": "related",
                                         "text": "1.4"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/1.6",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/1.6",
                                         "rel": "related",
                                         "text": "1.6"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/5.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/5.1",
                                         "rel": "related",
                                         "text": "5.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/14.6",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/14.6",
                                         "rel": "related",
                                         "text": "14.6"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/15.10",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/15.10",
                                         "rel": "related",
                                         "text": "15.10"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.8",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.8",
                                         "rel": "related",
                                         "text": "16.8"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.9",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.9",
                                         "rel": "related",
                                         "text": "16.9"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.11",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.11",
                                         "rel": "related",
                                         "text": "16.11"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-1",
                                         "rel": "related",
                                         "text": "PR.AC-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-3",
                                         "rel": "related",
                                         "text": "PR.AC-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-4",
                                         "rel": "related",
                                         "text": "PR.AC-4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-6",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-6",
                                         "rel": "related",
                                         "text": "PR.AC-6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-3",
                                         "rel": "related",
                                         "text": "PR.PT-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-4",
                                         "rel": "related",
                                         "text": "PR.PT-4"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/TM:SG4.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/TM:SG4.SP1",
                                         "rel": "related",
                                         "text": "TM:SG4.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-2",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-2",
                                         "rel": "related",
                                         "text": "AC-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-3",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-3",
                                         "rel": "related",
                                         "text": "AC-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-17",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-17",
                                         "rel": "related",
                                         "text": "AC-17"
                                     },
                                     {
-                                        "href": "/controls/AU_ACSC/Essential Eight",
+                                        "href": "/controls/catalogs/AU_ACSC/control/Essential Eight",
                                         "rel": "related",
                                         "text": "Essential Eight"
                                     }
@@ -243,12 +243,12 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.1.9",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.1.9",
                                         "rel": "related",
                                         "text": "3.1.9"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-8",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-8",
                                         "rel": "related",
                                         "text": "AC-8"
                                     }
@@ -285,37 +285,37 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.1.21",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.1.21",
                                         "rel": "related",
                                         "text": "3.1.21"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/13.7",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/13.7",
                                         "rel": "related",
                                         "text": "13.7"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/13.8",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/13.8",
                                         "rel": "related",
                                         "text": "13.8"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/13.9",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/13.9",
                                         "rel": "related",
                                         "text": "13.9"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/ID.AM-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/ID.AM-4",
                                         "rel": "related",
                                         "text": "ID.AM-4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-2",
                                         "rel": "related",
                                         "text": "PR.PT-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-20(2)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-20(2)",
                                         "rel": "related",
                                         "text": "AC-20(2)"
                                     }
@@ -352,107 +352,107 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/FAR_Clause_52.204-21/b.1.ii",
+                                        "href": "/controls/catalogs/FAR_Clause_52.204-21/control/b.1.ii",
                                         "rel": "related",
                                         "text": "b.1.ii"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.1.2",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.1.2",
                                         "rel": "related",
                                         "text": "3.1.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/1.4",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/1.4",
                                         "rel": "related",
                                         "text": "1.4"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/1.6",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/1.6",
                                         "rel": "related",
                                         "text": "1.6"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/5.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/5.1",
                                         "rel": "related",
                                         "text": "5.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/8.5",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/8.5",
                                         "rel": "related",
                                         "text": "8.5"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/14.6",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/14.6",
                                         "rel": "related",
                                         "text": "14.6"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/15.10",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/15.10",
                                         "rel": "related",
                                         "text": "15.10"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.8",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.8",
                                         "rel": "related",
                                         "text": "16.8"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.9",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.9",
                                         "rel": "related",
                                         "text": "16.9"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.11",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.11",
                                         "rel": "related",
                                         "text": "16.11"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-1",
                                         "rel": "related",
                                         "text": "PR.AC-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-3",
                                         "rel": "related",
                                         "text": "PR.AC-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-4",
                                         "rel": "related",
                                         "text": "PR.AC-4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-6",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-6",
                                         "rel": "related",
                                         "text": "PR.AC-6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-3",
                                         "rel": "related",
                                         "text": "PR.PT-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-4",
                                         "rel": "related",
                                         "text": "PR.PT-4"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/TM:SG4.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/TM:SG4.SP1",
                                         "rel": "related",
                                         "text": "TM:SG4.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-2",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-2",
                                         "rel": "related",
                                         "text": "AC-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-3",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-3",
                                         "rel": "related",
                                         "text": "AC-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-17",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-17",
                                         "rel": "related",
                                         "text": "AC-17"
                                     }
@@ -489,42 +489,42 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.1.5",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.1.5",
                                         "rel": "related",
                                         "text": "3.1.5"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/14.6",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/14.6",
                                         "rel": "related",
                                         "text": "14.6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-4",
                                         "rel": "related",
                                         "text": "PR.AC-4"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/KIM:SG4.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/KIM:SG4.SP1",
                                         "rel": "related",
                                         "text": "KIM:SG4.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-6",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-6",
                                         "rel": "related",
                                         "text": "AC-6"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-6(1)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-6(1)",
                                         "rel": "related",
                                         "text": "AC-6(1)"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-6(5)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-6(5)",
                                         "rel": "related",
                                         "text": "AC-6(5)"
                                     },
                                     {
-                                        "href": "/controls/UK_NCSC_Cyber_Essentials/~",
+                                        "href": "/controls/catalogs/UK_NCSC_Cyber_Essentials/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     }
@@ -561,17 +561,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.1.4",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.1.4",
                                         "rel": "related",
                                         "text": "3.1.4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-4",
                                         "rel": "related",
                                         "text": "PR.AC-4"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-5",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-5",
                                         "rel": "related",
                                         "text": "AC-5"
                                     }
@@ -608,127 +608,127 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC_modification_of_Draft_NIST_SP_800-171B/3.1.3e",
+                                        "href": "/controls/catalogs/CMMC_modification_of_Draft_NIST_SP_800-171B/control/3.1.3e",
                                         "rel": "related",
                                         "text": "3.1.3e"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/12.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/12.1",
                                         "rel": "related",
                                         "text": "12.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/12.2",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/12.2",
                                         "rel": "related",
                                         "text": "12.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/13.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/13.1",
                                         "rel": "related",
                                         "text": "13.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/13.3",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/13.3",
                                         "rel": "related",
                                         "text": "13.3"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/14.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/14.1",
                                         "rel": "related",
                                         "text": "14.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/14.2",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/14.2",
                                         "rel": "related",
                                         "text": "14.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/14.5",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/14.5",
                                         "rel": "related",
                                         "text": "14.5"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/14.6",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/14.6",
                                         "rel": "related",
                                         "text": "14.6"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/14.7",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/14.7",
                                         "rel": "related",
                                         "text": "14.7"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/15.6",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/15.6",
                                         "rel": "related",
                                         "text": "15.6"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/15.10",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/15.10",
                                         "rel": "related",
                                         "text": "15.10"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/ID.AM-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/ID.AM-3",
                                         "rel": "related",
                                         "text": "ID.AM-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-5",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-5",
                                         "rel": "related",
                                         "text": "PR.AC-5"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.DS-5",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.DS-5",
                                         "rel": "related",
                                         "text": "PR.DS-5"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-4",
                                         "rel": "related",
                                         "text": "PR.PT-4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.AE-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.AE-1",
                                         "rel": "related",
                                         "text": "DE.AE-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-4",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-4",
                                         "rel": "related",
                                         "text": "AC-4"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-4(1)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-4(1)",
                                         "rel": "related",
                                         "text": "AC-4(1)"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-4(6)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-4(6)",
                                         "rel": "related",
                                         "text": "AC-4(6)"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-4(8)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-4(8)",
                                         "rel": "related",
                                         "text": "AC-4(8)"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-4(12)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-4(12)",
                                         "rel": "related",
                                         "text": "AC-4(12)"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-4(13)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-4(13)",
                                         "rel": "related",
                                         "text": "AC-4(13)"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-4(15)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-4(15)",
                                         "rel": "related",
                                         "text": "AC-4(15)"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-4(20)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-4(20)",
                                         "rel": "related",
                                         "text": "AC-4(20)"
                                     }
@@ -765,32 +765,32 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/15.3",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/15.3",
                                         "rel": "related",
                                         "text": "15.3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.DS-5",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.DS-5",
                                         "rel": "related",
                                         "text": "PR.DS-5"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.AE-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.AE-1",
                                         "rel": "related",
                                         "text": "DE.AE-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-7",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-7",
                                         "rel": "related",
                                         "text": "DE.CM-7"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SI-4(14)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SI-4(14)",
                                         "rel": "related",
                                         "text": "SI-4(14)"
                                     }
@@ -827,32 +827,32 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.1.6",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.1.6",
                                         "rel": "related",
                                         "text": "3.1.6"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/4.3",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/4.3",
                                         "rel": "related",
                                         "text": "4.3"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/4.6",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/4.6",
                                         "rel": "related",
                                         "text": "4.6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-4",
                                         "rel": "related",
                                         "text": "PR.AC-4"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-6(2)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-6(2)",
                                         "rel": "related",
                                         "text": "AC-6(2)"
                                     },
                                     {
-                                        "href": "/controls/UK_NCSC_Cyber_Essentials/~",
+                                        "href": "/controls/catalogs/UK_NCSC_Cyber_Essentials/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     }
@@ -889,27 +889,27 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.1.7",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.1.7",
                                         "rel": "related",
                                         "text": "3.1.7"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-4",
                                         "rel": "related",
                                         "text": "PR.AC-4"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/KIM:SG4.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/KIM:SG4.SP1",
                                         "rel": "related",
                                         "text": "KIM:SG4.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-6(9)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-6(9)",
                                         "rel": "related",
                                         "text": "AC-6(9)"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-6(10)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-6(10)",
                                         "rel": "related",
                                         "text": "AC-6(10)"
                                     }
@@ -946,7 +946,7 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     }
@@ -983,17 +983,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.1.8",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.1.8",
                                         "rel": "related",
                                         "text": "3.1.8"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-7",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-7",
                                         "rel": "related",
                                         "text": "PR.AC-7"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-7",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-7",
                                         "rel": "related",
                                         "text": "AC-7"
                                     }
@@ -1030,22 +1030,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.1.11",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.1.11",
                                         "rel": "related",
                                         "text": "3.1.11"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.7",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.7",
                                         "rel": "related",
                                         "text": "16.7"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.11",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.11",
                                         "rel": "related",
                                         "text": "16.11"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-12",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-12",
                                         "rel": "related",
                                         "text": "AC-12"
                                     }
@@ -1082,22 +1082,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.1.10",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.1.10",
                                         "rel": "related",
                                         "text": "3.1.10"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.11",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.11",
                                         "rel": "related",
                                         "text": "16.11"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-11",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-11",
                                         "rel": "related",
                                         "text": "AC-11"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-11(1)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-11(1)",
                                         "rel": "related",
                                         "text": "AC-11(1)"
                                     }
@@ -1134,32 +1134,32 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.1.17",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.1.17",
                                         "rel": "related",
                                         "text": "3.1.17"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/15.7",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/15.7",
                                         "rel": "related",
                                         "text": "15.7"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/15.8",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/15.8",
                                         "rel": "related",
                                         "text": "15.8"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-4",
                                         "rel": "related",
                                         "text": "PR.PT-4"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/KIM:SG4.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/KIM:SG4.SP1",
                                         "rel": "related",
                                         "text": "KIM:SG4.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-18(1)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-18(1)",
                                         "rel": "related",
                                         "text": "AC-18(1)"
                                     }
@@ -1196,32 +1196,32 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.1.16",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.1.16",
                                         "rel": "related",
                                         "text": "3.1.16"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/15.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/15.1",
                                         "rel": "related",
                                         "text": "15.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/15.10",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/15.10",
                                         "rel": "related",
                                         "text": "15.10"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-4",
                                         "rel": "related",
                                         "text": "PR.PT-4"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/TM:SG2.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/TM:SG2.SP2",
                                         "rel": "related",
                                         "text": "TM:SG2.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-18",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-18",
                                         "rel": "related",
                                         "text": "AC-18"
                                     }
@@ -1258,42 +1258,42 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.1.18",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.1.18",
                                         "rel": "related",
                                         "text": "3.1.18"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/13.6",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/13.6",
                                         "rel": "related",
                                         "text": "13.6"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.7",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.7",
                                         "rel": "related",
                                         "text": "16.7"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-3",
                                         "rel": "related",
                                         "text": "PR.AC-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-6",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-6",
                                         "rel": "related",
                                         "text": "PR.AC-6"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/TM:SG2.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/TM:SG2.SP2",
                                         "rel": "related",
                                         "text": "TM:SG2.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-19",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-19",
                                         "rel": "related",
                                         "text": "AC-19"
                                     },
                                     {
-                                        "href": "/controls/UK_NCSC_Cyber_Essentials/~",
+                                        "href": "/controls/catalogs/UK_NCSC_Cyber_Essentials/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     }
@@ -1330,37 +1330,37 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.1.12",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.1.12",
                                         "rel": "related",
                                         "text": "3.1.12"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/12.11",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/12.11",
                                         "rel": "related",
                                         "text": "12.11"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/12.12",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/12.12",
                                         "rel": "related",
                                         "text": "12.12"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-3",
                                         "rel": "related",
                                         "text": "PR.AC-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-4",
                                         "rel": "related",
                                         "text": "PR.PT-4"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/TM:SG2.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/TM:SG2.SP2",
                                         "rel": "related",
                                         "text": "TM:SG2.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-17(1)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-17(1)",
                                         "rel": "related",
                                         "text": "AC-17(1)"
                                     }
@@ -1397,37 +1397,37 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.1.13",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.1.13",
                                         "rel": "related",
                                         "text": "3.1.13"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/15.7",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/15.7",
                                         "rel": "related",
                                         "text": "15.7"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/15.8",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/15.8",
                                         "rel": "related",
                                         "text": "15.8"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-3",
                                         "rel": "related",
                                         "text": "PR.AC-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-4",
                                         "rel": "related",
                                         "text": "PR.PT-4"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/KIM:SG4.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/KIM:SG4.SP1",
                                         "rel": "related",
                                         "text": "KIM:SG4.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-17(2)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-17(2)",
                                         "rel": "related",
                                         "text": "AC-17(2)"
                                     }
@@ -1464,7 +1464,7 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     }
@@ -1501,37 +1501,37 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.1.14",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.1.14",
                                         "rel": "related",
                                         "text": "3.1.14"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/15.5",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/15.5",
                                         "rel": "related",
                                         "text": "15.5"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/15.10",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/15.10",
                                         "rel": "related",
                                         "text": "15.10"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-3",
                                         "rel": "related",
                                         "text": "PR.AC-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-4",
                                         "rel": "related",
                                         "text": "PR.PT-4"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/TM:SG2.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/TM:SG2.SP2",
                                         "rel": "related",
                                         "text": "TM:SG2.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-17(3)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-17(3)",
                                         "rel": "related",
                                         "text": "AC-17(3)"
                                     }
@@ -1568,42 +1568,42 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.1.15",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.1.15",
                                         "rel": "related",
                                         "text": "3.1.15"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/8.8",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/8.8",
                                         "rel": "related",
                                         "text": "8.8"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/12.11",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/12.11",
                                         "rel": "related",
                                         "text": "12.11"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/12.12",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/12.12",
                                         "rel": "related",
                                         "text": "12.12"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-3",
                                         "rel": "related",
                                         "text": "PR.AC-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-4",
                                         "rel": "related",
                                         "text": "PR.PT-4"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/TM:SG2.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/TM:SG2.SP2",
                                         "rel": "related",
                                         "text": "TM:SG2.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-17(4)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-17(4)",
                                         "rel": "related",
                                         "text": "AC-17(4)"
                                     }
@@ -1640,47 +1640,47 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/FAR_Clause_52.204-21/b.1.iii",
+                                        "href": "/controls/catalogs/FAR_Clause_52.204-21/control/b.1.iii",
                                         "rel": "related",
                                         "text": "b.1.iii"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.1.20",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.1.20",
                                         "rel": "related",
                                         "text": "3.1.20"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/12.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/12.1",
                                         "rel": "related",
                                         "text": "12.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/12.4",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/12.4",
                                         "rel": "related",
                                         "text": "12.4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/ID.AM-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/ID.AM-4",
                                         "rel": "related",
                                         "text": "ID.AM-4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-3",
                                         "rel": "related",
                                         "text": "PR.AC-3"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/EXD:SG3.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/EXD:SG3.SP1",
                                         "rel": "related",
                                         "text": "EXD:SG3.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-20",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-20",
                                         "rel": "related",
                                         "text": "AC-20"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-20(1)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-20(1)",
                                         "rel": "related",
                                         "text": "AC-20(1)"
                                     }
@@ -1717,82 +1717,82 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.1.3",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.1.3",
                                         "rel": "related",
                                         "text": "3.1.3"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/12.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/12.1",
                                         "rel": "related",
                                         "text": "12.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/12.2",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/12.2",
                                         "rel": "related",
                                         "text": "12.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/12.5",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/12.5",
                                         "rel": "related",
                                         "text": "12.5"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/12.8",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/12.8",
                                         "rel": "related",
                                         "text": "12.8"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/13.3",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/13.3",
                                         "rel": "related",
                                         "text": "13.3"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/14.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/14.1",
                                         "rel": "related",
                                         "text": "14.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/14.6",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/14.6",
                                         "rel": "related",
                                         "text": "14.6"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/14.7",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/14.7",
                                         "rel": "related",
                                         "text": "14.7"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/ID.AM-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/ID.AM-3",
                                         "rel": "related",
                                         "text": "ID.AM-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-5",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-5",
                                         "rel": "related",
                                         "text": "PR.AC-5"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.DS-5",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.DS-5",
                                         "rel": "related",
                                         "text": "PR.DS-5"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-4",
                                         "rel": "related",
                                         "text": "PR.PT-4"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/TM:SG4.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/TM:SG4.SP1",
                                         "rel": "related",
                                         "text": "TM:SG4.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-4",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-4",
                                         "rel": "related",
                                         "text": "AC-4"
                                     },
                                     {
-                                        "href": "/controls/UK_NCSC_Cyber_Essentials/~",
+                                        "href": "/controls/catalogs/UK_NCSC_Cyber_Essentials/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     }
@@ -1829,27 +1829,27 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.1.19",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.1.19",
                                         "rel": "related",
                                         "text": "3.1.19"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/13.6",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/13.6",
                                         "rel": "related",
                                         "text": "13.6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-3",
                                         "rel": "related",
                                         "text": "PR.AC-3"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/KIM:SG4.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/KIM:SG4.SP1",
                                         "rel": "related",
                                         "text": "KIM:SG4.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-19(5)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-19(5)",
                                         "rel": "related",
                                         "text": "AC-19(5)"
                                     }
@@ -1886,17 +1886,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/FAR_Clause_52.204-21/b.1.iv",
+                                        "href": "/controls/catalogs/FAR_Clause_52.204-21/control/b.1.iv",
                                         "rel": "related",
                                         "text": "b.1.iv"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.1.22",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.1.22",
                                         "rel": "related",
                                         "text": "3.1.22"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AC-22",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AC-22",
                                         "rel": "related",
                                         "text": "AC-22"
                                     }
@@ -1940,67 +1940,67 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.3.2",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.3.2",
                                         "rel": "related",
                                         "text": "3.3.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.8",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.8",
                                         "rel": "related",
                                         "text": "16.8"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.9",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.9",
                                         "rel": "related",
                                         "text": "16.9"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-1",
                                         "rel": "related",
                                         "text": "DE.CM-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-3",
                                         "rel": "related",
                                         "text": "DE.CM-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-7",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-7",
                                         "rel": "related",
                                         "text": "DE.CM-7"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/MON:SG1.SP3",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/MON:SG1.SP3",
                                         "rel": "related",
                                         "text": "MON:SG1.SP3"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-2",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-2",
                                         "rel": "related",
                                         "text": "AU-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-3",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-3",
                                         "rel": "related",
                                         "text": "AU-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-3(1)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-3(1)",
                                         "rel": "related",
                                         "text": "AU-3(1)"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-6",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-6",
                                         "rel": "related",
                                         "text": "AU-6"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-11",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-11",
                                         "rel": "related",
                                         "text": "AU-11"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-12",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-12",
                                         "rel": "related",
                                         "text": "AU-12"
                                     }
@@ -2037,22 +2037,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.3.3",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.3.3",
                                         "rel": "related",
                                         "text": "3.3.3"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/6.7",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/6.7",
                                         "rel": "related",
                                         "text": "6.7"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/IMC:SG2.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/IMC:SG2.SP2",
                                         "rel": "related",
                                         "text": "IMC:SG2.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-2(3)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-2(3)",
                                         "rel": "related",
                                         "text": "AU-2(3)"
                                     }
@@ -2089,17 +2089,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.3.4",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.3.4",
                                         "rel": "related",
                                         "text": "3.3.4"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/6.7",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/6.7",
                                         "rel": "related",
                                         "text": "6.7"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-5",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-5",
                                         "rel": "related",
                                         "text": "AU-5"
                                     }
@@ -2136,47 +2136,47 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.3.1",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.3.1",
                                         "rel": "related",
                                         "text": "3.3.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/6.2",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/6.2",
                                         "rel": "related",
                                         "text": "6.2"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/MON:SG2.SP3",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/MON:SG2.SP3",
                                         "rel": "related",
                                         "text": "MON:SG2.SP3"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-2",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-2",
                                         "rel": "related",
                                         "text": "AU-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-3",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-3",
                                         "rel": "related",
                                         "text": "AU-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-3(1)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-3(1)",
                                         "rel": "related",
                                         "text": "AU-3(1)"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-6",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-6",
                                         "rel": "related",
                                         "text": "AU-6"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-11",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-11",
                                         "rel": "related",
                                         "text": "AU-11"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-12",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-12",
                                         "rel": "related",
                                         "text": "AU-12"
                                     }
@@ -2213,22 +2213,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/6.5",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/6.5",
                                         "rel": "related",
                                         "text": "6.5"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/COMP:SG3.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/COMP:SG3.SP1",
                                         "rel": "related",
                                         "text": "COMP:SG3.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-6(4)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-6(4)",
                                         "rel": "related",
                                         "text": "AU-6(4)"
                                     }
@@ -2265,17 +2265,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/6.2",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/6.2",
                                         "rel": "related",
                                         "text": "6.2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-12",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-12",
                                         "rel": "related",
                                         "text": "AU-12"
                                     }
@@ -2312,27 +2312,27 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.3.7",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.3.7",
                                         "rel": "related",
                                         "text": "3.3.7"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/6.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/6.1",
                                         "rel": "related",
                                         "text": "6.1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-1",
                                         "rel": "related",
                                         "text": "PR.PT-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-8",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-8",
                                         "rel": "related",
                                         "text": "AU-8"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-8(1)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-8(1)",
                                         "rel": "related",
                                         "text": "AU-8(1)"
                                     }
@@ -2369,22 +2369,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.3.8",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.3.8",
                                         "rel": "related",
                                         "text": "3.3.8"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/MON:SG2.SP3",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/MON:SG2.SP3",
                                         "rel": "related",
                                         "text": "MON:SG2.SP3"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-6(7)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-6(7)",
                                         "rel": "related",
                                         "text": "AU-6(7)"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-9",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-9",
                                         "rel": "related",
                                         "text": "AU-9"
                                     }
@@ -2421,22 +2421,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.3.9",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.3.9",
                                         "rel": "related",
                                         "text": "3.3.9"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/MON:SG2.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/MON:SG2.SP2",
                                         "rel": "related",
                                         "text": "MON:SG2.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-6(7)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-6(7)",
                                         "rel": "related",
                                         "text": "AU-6(7)"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-9(4)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-9(4)",
                                         "rel": "related",
                                         "text": "AU-9(4)"
                                     }
@@ -2473,27 +2473,27 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/6.7",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/6.7",
                                         "rel": "related",
                                         "text": "6.7"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-1",
                                         "rel": "related",
                                         "text": "PR.PT-1"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/COMP:SG3.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/COMP:SG3.SP1",
                                         "rel": "related",
                                         "text": "COMP:SG3.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-6",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-6",
                                         "rel": "related",
                                         "text": "AU-6"
                                     }
@@ -2530,32 +2530,32 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.3.5",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.3.5",
                                         "rel": "related",
                                         "text": "3.3.5"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/6.6",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/6.6",
                                         "rel": "related",
                                         "text": "6.6"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/6.7",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/6.7",
                                         "rel": "related",
                                         "text": "6.7"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.AE-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.AE-3",
                                         "rel": "related",
                                         "text": "DE.AE-3"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/COMP:SG3.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/COMP:SG3.SP1",
                                         "rel": "related",
                                         "text": "COMP:SG3.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-6(3)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-6(3)",
                                         "rel": "related",
                                         "text": "AU-6(3)"
                                     }
@@ -2592,22 +2592,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/6.6",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/6.6",
                                         "rel": "related",
                                         "text": "6.6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.AE-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.AE-3",
                                         "rel": "related",
                                         "text": "DE.AE-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SI-4(2)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SI-4(2)",
                                         "rel": "related",
                                         "text": "SI-4(2)"
                                     }
@@ -2644,22 +2644,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.3.6",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.3.6",
                                         "rel": "related",
                                         "text": "3.3.6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/RS.AN-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/RS.AN-3",
                                         "rel": "related",
                                         "text": "RS.AN-3"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/COMP:SG3.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/COMP:SG3.SP2",
                                         "rel": "related",
                                         "text": "COMP:SG3.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-7",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-7",
                                         "rel": "related",
                                         "text": "AU-7"
                                     }
@@ -2696,27 +2696,27 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-1",
                                         "rel": "related",
                                         "text": "PR.PT-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/RA-5(6)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/RA-5(6)",
                                         "rel": "related",
                                         "text": "RA-5(6)"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/RA-5(8)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/RA-5(8)",
                                         "rel": "related",
                                         "text": "RA-5(8)"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/RA-5(10)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/RA-5(10)",
                                         "rel": "related",
                                         "text": "RA-5(10)"
                                     }
@@ -2760,52 +2760,52 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.2.1",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.2.1",
                                         "rel": "related",
                                         "text": "3.2.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/17.3",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/17.3",
                                         "rel": "related",
                                         "text": "17.3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AT-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AT-1",
                                         "rel": "related",
                                         "text": "PR.AT-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AT-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AT-2",
                                         "rel": "related",
                                         "text": "PR.AT-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AT-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AT-3",
                                         "rel": "related",
                                         "text": "PR.AT-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AT-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AT-4",
                                         "rel": "related",
                                         "text": "PR.AT-4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AT-5",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AT-5",
                                         "rel": "related",
                                         "text": "PR.AT-5"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/OTA:SG1.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/OTA:SG1.SP1",
                                         "rel": "related",
                                         "text": "OTA:SG1.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AT-2",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AT-2",
                                         "rel": "related",
                                         "text": "AT-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AT-3",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AT-3",
                                         "rel": "related",
                                         "text": "AT-3"
                                     }
@@ -2842,22 +2842,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.2.3",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.2.3",
                                         "rel": "related",
                                         "text": "3.2.3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/ID.RA-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/ID.RA-3",
                                         "rel": "related",
                                         "text": "ID.RA-3"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/OTA:SG2.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/OTA:SG2.SP1",
                                         "rel": "related",
                                         "text": "OTA:SG2.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AT-2(2)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AT-2(2)",
                                         "rel": "related",
                                         "text": "AT-2(2)"
                                     }
@@ -2894,57 +2894,57 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/Draft_NIST_SP_800-171B/3.2.1e",
+                                        "href": "/controls/catalogs/Draft_NIST_SP_800-171B/control/3.2.1e",
                                         "rel": "related",
                                         "text": "3.2.1e"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/17.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/17.1",
                                         "rel": "related",
                                         "text": "17.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/17.2",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/17.2",
                                         "rel": "related",
                                         "text": "17.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/17.4",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/17.4",
                                         "rel": "related",
                                         "text": "17.4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AT-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AT-1",
                                         "rel": "related",
                                         "text": "PR.AT-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AT-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AT-2",
                                         "rel": "related",
                                         "text": "PR.AT-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AT-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AT-3",
                                         "rel": "related",
                                         "text": "PR.AT-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AT-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AT-4",
                                         "rel": "related",
                                         "text": "PR.AT-4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AT-5",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AT-5",
                                         "rel": "related",
                                         "text": "PR.AT-5"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/OTA:SG2.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/OTA:SG2.SP1",
                                         "rel": "related",
                                         "text": "OTA:SG2.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AT-2",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AT-2",
                                         "rel": "related",
                                         "text": "AT-2"
                                     }
@@ -2981,62 +2981,62 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC_modification_of_Draft_NIST_SP_800-171B/3.2.2e",
+                                        "href": "/controls/catalogs/CMMC_modification_of_Draft_NIST_SP_800-171B/control/3.2.2e",
                                         "rel": "related",
                                         "text": "3.2.2e"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/17.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/17.1",
                                         "rel": "related",
                                         "text": "17.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/17.2",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/17.2",
                                         "rel": "related",
                                         "text": "17.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/17.4",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/17.4",
                                         "rel": "related",
                                         "text": "17.4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AT-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AT-1",
                                         "rel": "related",
                                         "text": "PR.AT-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AT-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AT-2",
                                         "rel": "related",
                                         "text": "PR.AT-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AT-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AT-3",
                                         "rel": "related",
                                         "text": "PR.AT-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AT-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AT-4",
                                         "rel": "related",
                                         "text": "PR.AT-4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AT-5",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AT-5",
                                         "rel": "related",
                                         "text": "PR.AT-5"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/OTA:SG3.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/OTA:SG3.SP1",
                                         "rel": "related",
                                         "text": "OTA:SG3.SP1"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/OTA:SG3.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/OTA:SG3.SP2",
                                         "rel": "related",
                                         "text": "OTA:SG3.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AT-2(1)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AT-2(1)",
                                         "rel": "related",
                                         "text": "AT-2(1)"
                                     }
@@ -3073,72 +3073,72 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.2.2",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.2.2",
                                         "rel": "related",
                                         "text": "3.2.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/17.5",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/17.5",
                                         "rel": "related",
                                         "text": "17.5"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/17.6",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/17.6",
                                         "rel": "related",
                                         "text": "17.6"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/17.7",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/17.7",
                                         "rel": "related",
                                         "text": "17.7"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/17.8",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/17.8",
                                         "rel": "related",
                                         "text": "17.8"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/17.9",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/17.9",
                                         "rel": "related",
                                         "text": "17.9"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AT-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AT-1",
                                         "rel": "related",
                                         "text": "PR.AT-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AT-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AT-2",
                                         "rel": "related",
                                         "text": "PR.AT-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AT-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AT-3",
                                         "rel": "related",
                                         "text": "PR.AT-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AT-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AT-4",
                                         "rel": "related",
                                         "text": "PR.AT-4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AT-5",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AT-5",
                                         "rel": "related",
                                         "text": "PR.AT-5"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/OTA:SG4.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/OTA:SG4.SP1",
                                         "rel": "related",
                                         "text": "OTA:SG4.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AT-2",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AT-2",
                                         "rel": "related",
                                         "text": "AT-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AT-3",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AT-3",
                                         "rel": "related",
                                         "text": "AT-3"
                                     }
@@ -3182,92 +3182,92 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.4.1",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.4.1",
                                         "rel": "related",
                                         "text": "3.4.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/1.4",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/1.4",
                                         "rel": "related",
                                         "text": "1.4"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/1.5",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/1.5",
                                         "rel": "related",
                                         "text": "1.5"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.1",
                                         "rel": "related",
                                         "text": "2.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.4",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.4",
                                         "rel": "related",
                                         "text": "2.4"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/5.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/5.1",
                                         "rel": "related",
                                         "text": "5.1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/ID.AM-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/ID.AM-1",
                                         "rel": "related",
                                         "text": "ID.AM-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/ID.AM-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/ID.AM-2",
                                         "rel": "related",
                                         "text": "ID.AM-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.DS-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.DS-3",
                                         "rel": "related",
                                         "text": "PR.DS-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.DS-7",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.DS-7",
                                         "rel": "related",
                                         "text": "PR.DS-7"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.IP-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.IP-1",
                                         "rel": "related",
                                         "text": "PR.IP-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.AE-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.AE-1",
                                         "rel": "related",
                                         "text": "DE.AE-1"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/KIM:SG5.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/KIM:SG5.SP2",
                                         "rel": "related",
                                         "text": "KIM:SG5.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CM-2",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CM-2",
                                         "rel": "related",
                                         "text": "CM-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CM-6",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CM-6",
                                         "rel": "related",
                                         "text": "CM-6"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CM-8",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CM-8",
                                         "rel": "related",
                                         "text": "CM-8"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CM-8(1)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CM-8(1)",
                                         "rel": "related",
                                         "text": "CM-8(1)"
                                     },
                                     {
-                                        "href": "/controls/UK_NCSC_Cyber_Essentials/~",
+                                        "href": "/controls/catalogs/UK_NCSC_Cyber_Essentials/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     }
@@ -3304,32 +3304,32 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.4.6",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.4.6",
                                         "rel": "related",
                                         "text": "3.4.6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.IP-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.IP-1",
                                         "rel": "related",
                                         "text": "PR.IP-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-3",
                                         "rel": "related",
                                         "text": "PR.PT-3"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/TM:SG2.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/TM:SG2.SP2",
                                         "rel": "related",
                                         "text": "TM:SG2.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CM-7",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CM-7",
                                         "rel": "related",
                                         "text": "CM-7"
                                     },
                                     {
-                                        "href": "/controls/UK_NCSC_Cyber_Essentials/~",
+                                        "href": "/controls/catalogs/UK_NCSC_Cyber_Essentials/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     }
@@ -3366,37 +3366,37 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.4.9",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.4.9",
                                         "rel": "related",
                                         "text": "3.4.9"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.1",
                                         "rel": "related",
                                         "text": "2.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.2",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.2",
                                         "rel": "related",
                                         "text": "2.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.6",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.6",
                                         "rel": "related",
                                         "text": "2.6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-3",
                                         "rel": "related",
                                         "text": "DE.CM-3"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/MON:SG2.SP3",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/MON:SG2.SP3",
                                         "rel": "related",
                                         "text": "MON:SG2.SP3"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CM-11",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CM-11",
                                         "rel": "related",
                                         "text": "CM-11"
                                     }
@@ -3433,92 +3433,92 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.4.2",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.4.2",
                                         "rel": "related",
                                         "text": "3.4.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/1.4",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/1.4",
                                         "rel": "related",
                                         "text": "1.4"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/1.5",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/1.5",
                                         "rel": "related",
                                         "text": "1.5"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.1",
                                         "rel": "related",
                                         "text": "2.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.4",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.4",
                                         "rel": "related",
                                         "text": "2.4"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/5.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/5.1",
                                         "rel": "related",
                                         "text": "5.1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/ID.AM-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/ID.AM-1",
                                         "rel": "related",
                                         "text": "ID.AM-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/ID.AM-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/ID.AM-2",
                                         "rel": "related",
                                         "text": "ID.AM-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.DS-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.DS-3",
                                         "rel": "related",
                                         "text": "PR.DS-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.DS-7",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.DS-7",
                                         "rel": "related",
                                         "text": "PR.DS-7"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.IP-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.IP-1",
                                         "rel": "related",
                                         "text": "PR.IP-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.AE-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.AE-1",
                                         "rel": "related",
                                         "text": "DE.AE-1"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/TM:SG2.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/TM:SG2.SP2",
                                         "rel": "related",
                                         "text": "TM:SG2.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CM-2",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CM-2",
                                         "rel": "related",
                                         "text": "CM-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CM-6",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CM-6",
                                         "rel": "related",
                                         "text": "CM-6"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CM-8",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CM-8",
                                         "rel": "related",
                                         "text": "CM-8"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CM-8(1)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CM-8(1)",
                                         "rel": "related",
                                         "text": "CM-8(1)"
                                     },
                                     {
-                                        "href": "/controls/UK_NCSC_Cyber_Essentials/~",
+                                        "href": "/controls/catalogs/UK_NCSC_Cyber_Essentials/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     }
@@ -3555,67 +3555,67 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.4.5",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.4.5",
                                         "rel": "related",
                                         "text": "3.4.5"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.5",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.5",
                                         "rel": "related",
                                         "text": "2.5"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.7",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.7",
                                         "rel": "related",
                                         "text": "2.7"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.8",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.8",
                                         "rel": "related",
                                         "text": "2.8"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.9",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.9",
                                         "rel": "related",
                                         "text": "2.9"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/4.3",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/4.3",
                                         "rel": "related",
                                         "text": "4.3"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/11.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/11.1",
                                         "rel": "related",
                                         "text": "11.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/11.3",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/11.3",
                                         "rel": "related",
                                         "text": "11.3"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/11.7",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/11.7",
                                         "rel": "related",
                                         "text": "11.7"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.IP-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.IP-1",
                                         "rel": "related",
                                         "text": "PR.IP-1"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/TM:SG4.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/TM:SG4.SP1",
                                         "rel": "related",
                                         "text": "TM:SG4.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CM-5",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CM-5",
                                         "rel": "related",
                                         "text": "CM-5"
                                     },
                                     {
-                                        "href": "/controls/UK_NCSC_Cyber_Essentials/~",
+                                        "href": "/controls/catalogs/UK_NCSC_Cyber_Essentials/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     }
@@ -3652,57 +3652,57 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC_modification_of_NIST_SP_800-171/3.4.8",
+                                        "href": "/controls/catalogs/CMMC_modification_of_NIST_SP_800-171/control/3.4.8",
                                         "rel": "related",
                                         "text": "3.4.8"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.1",
                                         "rel": "related",
                                         "text": "2.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.2",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.2",
                                         "rel": "related",
                                         "text": "2.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.6",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.6",
                                         "rel": "related",
                                         "text": "2.6"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.7",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.7",
                                         "rel": "related",
                                         "text": "2.7"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.8",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.8",
                                         "rel": "related",
                                         "text": "2.8"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.9",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.9",
                                         "rel": "related",
                                         "text": "2.9"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-3",
                                         "rel": "related",
                                         "text": "PR.PT-3"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/TM:SG2.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/TM:SG2.SP2",
                                         "rel": "related",
                                         "text": "TM:SG2.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CM-7(4)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CM-7(4)",
                                         "rel": "related",
                                         "text": "CM-7(4)"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CM-7(5)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CM-7(5)",
                                         "rel": "related",
                                         "text": "CM-7(5)"
                                     }
@@ -3739,52 +3739,52 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC_modification_of_Draft_NIST_SP_800-171B/3.14.1e",
+                                        "href": "/controls/catalogs/CMMC_modification_of_Draft_NIST_SP_800-171B/control/3.14.1e",
                                         "rel": "related",
                                         "text": "3.14.1e"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.10",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.10",
                                         "rel": "related",
                                         "text": "2.10"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.DS-6",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.DS-6",
                                         "rel": "related",
                                         "text": "PR.DS-6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.DS-8",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.DS-8",
                                         "rel": "related",
                                         "text": "PR.DS-8"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.IP-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.IP-2",
                                         "rel": "related",
                                         "text": "PR.IP-2"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/TM:SG2.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/TM:SG2.SP2",
                                         "rel": "related",
                                         "text": "TM:SG2.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/ SI-7(6)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/ SI-7(6)",
                                         "rel": "related",
                                         "text": " SI-7(6)"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SI-7(9)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SI-7(9)",
                                         "rel": "related",
                                         "text": "SI-7(9)"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SI-7(10)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SI-7(10)",
                                         "rel": "related",
                                         "text": "SI-7(10)"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SA-17",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SA-17",
                                         "rel": "related",
                                         "text": "SA-17"
                                     }
@@ -3821,32 +3821,32 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.4.3",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.4.3",
                                         "rel": "related",
                                         "text": "3.4.3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.IP-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.IP-1",
                                         "rel": "related",
                                         "text": "PR.IP-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.IP-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.IP-3",
                                         "rel": "related",
                                         "text": "PR.IP-3"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/KIM:SG5.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/KIM:SG5.SP2",
                                         "rel": "related",
                                         "text": "KIM:SG5.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CM-3",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CM-3",
                                         "rel": "related",
                                         "text": "CM-3"
                                     },
                                     {
-                                        "href": "/controls/AU_ACSC/Essential Eight",
+                                        "href": "/controls/catalogs/AU_ACSC/control/Essential Eight",
                                         "rel": "related",
                                         "text": "Essential Eight"
                                     }
@@ -3883,52 +3883,52 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.4.7",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.4.7",
                                         "rel": "related",
                                         "text": "3.4.7"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/9.2",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/9.2",
                                         "rel": "related",
                                         "text": "9.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/9.4",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/9.4",
                                         "rel": "related",
                                         "text": "9.4"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/12.4",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/12.4",
                                         "rel": "related",
                                         "text": "12.4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.IP-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.IP-1",
                                         "rel": "related",
                                         "text": "PR.IP-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-3",
                                         "rel": "related",
                                         "text": "PR.PT-3"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/TM:SG2.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/TM:SG2.SP2",
                                         "rel": "related",
                                         "text": "TM:SG2.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CM-7(1)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CM-7(1)",
                                         "rel": "related",
                                         "text": "CM-7(1)"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CM-7(2)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CM-7(2)",
                                         "rel": "related",
                                         "text": "CM-7(2)"
                                     },
                                     {
-                                        "href": "/controls/UK_NCSC_Cyber_Essentials/~",
+                                        "href": "/controls/catalogs/UK_NCSC_Cyber_Essentials/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     }
@@ -3965,17 +3965,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.4.4",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.4.4",
                                         "rel": "related",
                                         "text": "3.4.4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.IP-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.IP-3",
                                         "rel": "related",
                                         "text": "PR.IP-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CM-4",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CM-4",
                                         "rel": "related",
                                         "text": "CM-4"
                                     }
@@ -4012,62 +4012,62 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.4.8",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.4.8",
                                         "rel": "related",
                                         "text": "3.4.8"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.1",
                                         "rel": "related",
                                         "text": "2.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.2",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.2",
                                         "rel": "related",
                                         "text": "2.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.6",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.6",
                                         "rel": "related",
                                         "text": "2.6"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.7",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.7",
                                         "rel": "related",
                                         "text": "2.7"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.8",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.8",
                                         "rel": "related",
                                         "text": "2.8"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.9",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.9",
                                         "rel": "related",
                                         "text": "2.9"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-3",
                                         "rel": "related",
                                         "text": "PR.PT-3"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/TM:SG2.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/TM:SG2.SP2",
                                         "rel": "related",
                                         "text": "TM:SG2.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CM-7(4)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CM-7(4)",
                                         "rel": "related",
                                         "text": "CM-7(4)"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CM-7(5)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CM-7(5)",
                                         "rel": "related",
                                         "text": "CM-7(5)"
                                     },
                                     {
-                                        "href": "/controls/UK_NCSC_Cyber_Essentials/~",
+                                        "href": "/controls/catalogs/UK_NCSC_Cyber_Essentials/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     }
@@ -4111,67 +4111,67 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/FAR_Clause_52.204-21/b.1.v",
+                                        "href": "/controls/catalogs/FAR_Clause_52.204-21/control/b.1.v",
                                         "rel": "related",
                                         "text": "b.1.v"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.5.1",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.5.1",
                                         "rel": "related",
                                         "text": "3.5.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/4.2",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/4.2",
                                         "rel": "related",
                                         "text": "4.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/4.3",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/4.3",
                                         "rel": "related",
                                         "text": "4.3"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.8",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.8",
                                         "rel": "related",
                                         "text": "16.8"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.9",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.9",
                                         "rel": "related",
                                         "text": "16.9"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-1",
                                         "rel": "related",
                                         "text": "PR.AC-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-6",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-6",
                                         "rel": "related",
                                         "text": "PR.AC-6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-7",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-7",
                                         "rel": "related",
                                         "text": "PR.AC-7"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/ID:SG1.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/ID:SG1.SP1",
                                         "rel": "related",
                                         "text": "ID:SG1.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IA-2",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IA-2",
                                         "rel": "related",
                                         "text": "IA-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IA-3",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IA-3",
                                         "rel": "related",
                                         "text": "IA-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IA-5",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IA-5",
                                         "rel": "related",
                                         "text": "IA-5"
                                     }
@@ -4208,42 +4208,42 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.5.7",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.5.7",
                                         "rel": "related",
                                         "text": "3.5.7"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/4.2",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/4.2",
                                         "rel": "related",
                                         "text": "4.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/4.4",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/4.4",
                                         "rel": "related",
                                         "text": "4.4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-1",
                                         "rel": "related",
                                         "text": "PR.AC-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-6",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-6",
                                         "rel": "related",
                                         "text": "PR.AC-6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-7",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-7",
                                         "rel": "related",
                                         "text": "PR.AC-7"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IA-5(1)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IA-5(1)",
                                         "rel": "related",
                                         "text": "IA-5(1)"
                                     },
                                     {
-                                        "href": "/controls/UK_NCSC_Cyber_Essentials/~",
+                                        "href": "/controls/catalogs/UK_NCSC_Cyber_Essentials/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     }
@@ -4280,62 +4280,62 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.5.3",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.5.3",
                                         "rel": "related",
                                         "text": "3.5.3"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/4.5",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/4.5",
                                         "rel": "related",
                                         "text": "4.5"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/11.5",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/11.5",
                                         "rel": "related",
                                         "text": "11.5"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/12.11",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/12.11",
                                         "rel": "related",
                                         "text": "12.11"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-1",
                                         "rel": "related",
                                         "text": "PR.AC-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-6",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-6",
                                         "rel": "related",
                                         "text": "PR.AC-6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-7",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-7",
                                         "rel": "related",
                                         "text": "PR.AC-7"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/TM:SG4.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/TM:SG4.SP1",
                                         "rel": "related",
                                         "text": "TM:SG4.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IA-2(1)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IA-2(1)",
                                         "rel": "related",
                                         "text": "IA-2(1)"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IA-2(2)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IA-2(2)",
                                         "rel": "related",
                                         "text": "IA-2(2)"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IA-2(3)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IA-2(3)",
                                         "rel": "related",
                                         "text": "IA-2(3)"
                                     },
                                     {
-                                        "href": "/controls/AU_ACSC/Essential Eight",
+                                        "href": "/controls/catalogs/AU_ACSC/control/Essential Eight",
                                         "rel": "related",
                                         "text": "Essential Eight"
                                     }
@@ -4372,72 +4372,72 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/FAR_Clause_52.204-21/b.1.vi",
+                                        "href": "/controls/catalogs/FAR_Clause_52.204-21/control/b.1.vi",
                                         "rel": "related",
                                         "text": "b.1.vi"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.5.2",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.5.2",
                                         "rel": "related",
                                         "text": "3.5.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/4.2",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/4.2",
                                         "rel": "related",
                                         "text": "4.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/4.3",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/4.3",
                                         "rel": "related",
                                         "text": "4.3"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.8",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.8",
                                         "rel": "related",
                                         "text": "16.8"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.9",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.9",
                                         "rel": "related",
                                         "text": "16.9"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-1",
                                         "rel": "related",
                                         "text": "PR.AC-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-6",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-6",
                                         "rel": "related",
                                         "text": "PR.AC-6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-7",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-7",
                                         "rel": "related",
                                         "text": "PR.AC-7"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/TM:SG4.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/TM:SG4.SP1",
                                         "rel": "related",
                                         "text": "TM:SG4.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IA-2",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IA-2",
                                         "rel": "related",
                                         "text": "IA-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IA-3",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IA-3",
                                         "rel": "related",
                                         "text": "IA-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IA-5",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IA-5",
                                         "rel": "related",
                                         "text": "IA-5"
                                     },
                                     {
-                                        "href": "/controls/UK_NCSC_Cyber_Essentials/~",
+                                        "href": "/controls/catalogs/UK_NCSC_Cyber_Essentials/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     }
@@ -4474,37 +4474,37 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.5.8",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.5.8",
                                         "rel": "related",
                                         "text": "3.5.8"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/4.2",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/4.2",
                                         "rel": "related",
                                         "text": "4.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/4.4",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/4.4",
                                         "rel": "related",
                                         "text": "4.4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-1",
                                         "rel": "related",
                                         "text": "PR.AC-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-6",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-6",
                                         "rel": "related",
                                         "text": "PR.AC-6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-7",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-7",
                                         "rel": "related",
                                         "text": "PR.AC-7"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IA-5(1)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IA-5(1)",
                                         "rel": "related",
                                         "text": "IA-5(1)"
                                     }
@@ -4541,32 +4541,32 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.5.4",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.5.4",
                                         "rel": "related",
                                         "text": "3.5.4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-1",
                                         "rel": "related",
                                         "text": "PR.AC-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-6",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-6",
                                         "rel": "related",
                                         "text": "PR.AC-6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-7",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-7",
                                         "rel": "related",
                                         "text": "PR.AC-7"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IA-2(8)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IA-2(8)",
                                         "rel": "related",
                                         "text": "IA-2(8)"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IA-2(9)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IA-2(9)",
                                         "rel": "related",
                                         "text": "IA-2(9)"
                                     }
@@ -4603,27 +4603,27 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.5.9",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.5.9",
                                         "rel": "related",
                                         "text": "3.5.9"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-1",
                                         "rel": "related",
                                         "text": "PR.AC-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-6",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-6",
                                         "rel": "related",
                                         "text": "PR.AC-6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-7",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-7",
                                         "rel": "related",
                                         "text": "PR.AC-7"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IA-5(1)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IA-5(1)",
                                         "rel": "related",
                                         "text": "IA-5(1)"
                                     }
@@ -4660,42 +4660,42 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.5.5",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.5.5",
                                         "rel": "related",
                                         "text": "3.5.5"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.7",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.7",
                                         "rel": "related",
                                         "text": "16.7"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.10",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.10",
                                         "rel": "related",
                                         "text": "16.10"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.12",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.12",
                                         "rel": "related",
                                         "text": "16.12"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-1",
                                         "rel": "related",
                                         "text": "PR.AC-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-6",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-6",
                                         "rel": "related",
                                         "text": "PR.AC-6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-7",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-7",
                                         "rel": "related",
                                         "text": "PR.AC-7"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IA-4",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IA-4",
                                         "rel": "related",
                                         "text": "IA-4"
                                     }
@@ -4732,42 +4732,42 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.5.10",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.5.10",
                                         "rel": "related",
                                         "text": "3.5.10"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.4",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.4",
                                         "rel": "related",
                                         "text": "16.4"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.5",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.5",
                                         "rel": "related",
                                         "text": "16.5"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-1",
                                         "rel": "related",
                                         "text": "PR.AC-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-6",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-6",
                                         "rel": "related",
                                         "text": "PR.AC-6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-7",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-7",
                                         "rel": "related",
                                         "text": "PR.AC-7"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/KIM:SG4.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/KIM:SG4.SP1",
                                         "rel": "related",
                                         "text": "KIM:SG4.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IA-5(1)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IA-5(1)",
                                         "rel": "related",
                                         "text": "IA-5(1)"
                                     }
@@ -4804,42 +4804,42 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.5.6",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.5.6",
                                         "rel": "related",
                                         "text": "3.5.6"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.9",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.9",
                                         "rel": "related",
                                         "text": "16.9"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.10",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.10",
                                         "rel": "related",
                                         "text": "16.10"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.11",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.11",
                                         "rel": "related",
                                         "text": "16.11"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-1",
                                         "rel": "related",
                                         "text": "PR.AC-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-6",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-6",
                                         "rel": "related",
                                         "text": "PR.AC-6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-7",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-7",
                                         "rel": "related",
                                         "text": "PR.AC-7"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IA-4",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IA-4",
                                         "rel": "related",
                                         "text": "IA-4"
                                     }
@@ -4876,17 +4876,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.5.11",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.5.11",
                                         "rel": "related",
                                         "text": "3.5.11"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-1",
                                         "rel": "related",
                                         "text": "PR.AC-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IA-6",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IA-6",
                                         "rel": "related",
                                         "text": "IA-6"
                                     }
@@ -4930,22 +4930,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.6.1",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.6.1",
                                         "rel": "related",
                                         "text": "3.6.1"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/IMC:SG1.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/IMC:SG1.SP1",
                                         "rel": "related",
                                         "text": "IMC:SG1.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IR-2",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IR-2",
                                         "rel": "related",
                                         "text": "IR-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IR-4",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IR-4",
                                         "rel": "related",
                                         "text": "IR-4"
                                     }
@@ -4982,7 +4982,7 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     }
@@ -5019,17 +5019,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/RS.AM-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/RS.AM-3",
                                         "rel": "related",
                                         "text": "RS.AM-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-12",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-12",
                                         "rel": "related",
                                         "text": "AU-12"
                                     }
@@ -5066,37 +5066,37 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/19.4",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/19.4",
                                         "rel": "related",
                                         "text": "19.4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-1",
                                         "rel": "related",
                                         "text": "DE.CM-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-2",
                                         "rel": "related",
                                         "text": "DE.CM-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-3",
                                         "rel": "related",
                                         "text": "DE.CM-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/RS.CO-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/RS.CO-2",
                                         "rel": "related",
                                         "text": "RS.CO-2"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/IMC:SG2.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/IMC:SG2.SP1",
                                         "rel": "related",
                                         "text": "IMC:SG2.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IR-6",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IR-6",
                                         "rel": "related",
                                         "text": "IR-6"
                                     }
@@ -5133,12 +5133,12 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/IMC:SG2.SP4",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/IMC:SG2.SP4",
                                         "rel": "related",
                                         "text": "IMC:SG2.SP4"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IR-4(3)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IR-4(3)",
                                         "rel": "related",
                                         "text": "IR-4(3)"
                                     }
@@ -5175,22 +5175,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/19.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/19.1",
                                         "rel": "related",
                                         "text": "19.1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/RS.RP-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/RS.RP-1",
                                         "rel": "related",
                                         "text": "RS.RP-1"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/IMC:SG4.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/IMC:SG4.SP2",
                                         "rel": "related",
                                         "text": "IMC:SG4.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IR-4",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IR-4",
                                         "rel": "related",
                                         "text": "IR-4"
                                     }
@@ -5227,37 +5227,37 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.6.2",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.6.2",
                                         "rel": "related",
                                         "text": "3.6.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/19.4",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/19.4",
                                         "rel": "related",
                                         "text": "19.4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/RS.CO-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/RS.CO-2",
                                         "rel": "related",
                                         "text": "RS.CO-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/RS.CO-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/RS.CO-3",
                                         "rel": "related",
                                         "text": "RS.CO-3"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/IMC:SG2.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/IMC:SG2.SP2",
                                         "rel": "related",
                                         "text": "IMC:SG2.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IR-6",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IR-6",
                                         "rel": "related",
                                         "text": "IR-6"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IR-7",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IR-7",
                                         "rel": "related",
                                         "text": "IR-7"
                                     }
@@ -5294,7 +5294,7 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC_modification_of_Draft_NIST_SP_800-171B/3.6.1e",
+                                        "href": "/controls/catalogs/CMMC_modification_of_Draft_NIST_SP_800-171B/control/3.6.1e",
                                         "rel": "related",
                                         "text": "3.6.1e"
                                     }
@@ -5331,12 +5331,12 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IR-4(1)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IR-4(1)",
                                         "rel": "related",
                                         "text": "IR-4(1)"
                                     }
@@ -5373,7 +5373,7 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC_modification_of_Draft_NIST_SP_800-171B/3.6.2e",
+                                        "href": "/controls/catalogs/CMMC_modification_of_Draft_NIST_SP_800-171B/control/3.6.2e",
                                         "rel": "related",
                                         "text": "3.6.2e"
                                     }
@@ -5410,17 +5410,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.AE-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.AE-2",
                                         "rel": "related",
                                         "text": "DE.AE-2"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/IMC:SG5.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/IMC:SG5.SP1",
                                         "rel": "related",
                                         "text": "IMC:SG5.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/AU-2",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/AU-2",
                                         "rel": "related",
                                         "text": "AU-2"
                                     }
@@ -5457,22 +5457,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.6.3",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.6.3",
                                         "rel": "related",
                                         "text": "3.6.3"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/19.7",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/19.7",
                                         "rel": "related",
                                         "text": "19.7"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.DP-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.DP-3",
                                         "rel": "related",
                                         "text": "DE.DP-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/IR-3",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/IR-3",
                                         "rel": "related",
                                         "text": "IR-3"
                                     }
@@ -5509,12 +5509,12 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/19.7",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/19.7",
                                         "rel": "related",
                                         "text": "19.7"
                                     }
@@ -5558,22 +5558,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.7.1",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.7.1",
                                         "rel": "related",
                                         "text": "3.7.1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.MA-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.MA-1",
                                         "rel": "related",
                                         "text": "PR.MA-1"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/TM:SG5.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/TM:SG5.SP2",
                                         "rel": "related",
                                         "text": "TM:SG5.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/MA-2",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/MA-2",
                                         "rel": "related",
                                         "text": "MA-2"
                                     }
@@ -5610,17 +5610,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.7.3",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.7.3",
                                         "rel": "related",
                                         "text": "3.7.3"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/TM:SG5.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/TM:SG5.SP2",
                                         "rel": "related",
                                         "text": "TM:SG5.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/MA-2",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/MA-2",
                                         "rel": "related",
                                         "text": "MA-2"
                                     }
@@ -5657,17 +5657,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.7.2",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.7.2",
                                         "rel": "related",
                                         "text": "3.7.2"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/TM:SG5.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/TM:SG5.SP2",
                                         "rel": "related",
                                         "text": "TM:SG5.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/MA-3",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/MA-3",
                                         "rel": "related",
                                         "text": "MA-3"
                                     }
@@ -5704,12 +5704,12 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.7.4",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.7.4",
                                         "rel": "related",
                                         "text": "3.7.4"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/MA-3(2)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/MA-3(2)",
                                         "rel": "related",
                                         "text": "MA-3(2)"
                                     }
@@ -5746,22 +5746,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.7.5",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.7.5",
                                         "rel": "related",
                                         "text": "3.7.5"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.MA-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.MA-2",
                                         "rel": "related",
                                         "text": "PR.MA-2"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/TM:SG4.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/TM:SG4.SP1",
                                         "rel": "related",
                                         "text": "TM:SG4.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/MA-4",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/MA-4",
                                         "rel": "related",
                                         "text": "MA-4"
                                     }
@@ -5798,17 +5798,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.7.6",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.7.6",
                                         "rel": "related",
                                         "text": "3.7.6"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/TM:SG5.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/TM:SG5.SP2",
                                         "rel": "related",
                                         "text": "TM:SG5.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/MA-5",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/MA-5",
                                         "rel": "related",
                                         "text": "MA-5"
                                     }
@@ -5852,22 +5852,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.8.4",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.8.4",
                                         "rel": "related",
                                         "text": "3.8.4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-2",
                                         "rel": "related",
                                         "text": "PR.PT-2"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/MON:SG2.SP4",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/MON:SG2.SP4",
                                         "rel": "related",
                                         "text": "MON:SG2.SP4"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/MP-3",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/MP-3",
                                         "rel": "related",
                                         "text": "MP-3"
                                     }
@@ -5904,22 +5904,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.8.1",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.8.1",
                                         "rel": "related",
                                         "text": "3.8.1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-2",
                                         "rel": "related",
                                         "text": "PR.PT-2"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/KIM:SG2.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/KIM:SG2.SP2",
                                         "rel": "related",
                                         "text": "KIM:SG2.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/MP-4",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/MP-4",
                                         "rel": "related",
                                         "text": "MP-4"
                                     }
@@ -5956,22 +5956,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.8.8",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.8.8",
                                         "rel": "related",
                                         "text": "3.8.8"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-2",
                                         "rel": "related",
                                         "text": "PR.PT-2"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/MON:SG2.SP4",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/MON:SG2.SP4",
                                         "rel": "related",
                                         "text": "MON:SG2.SP4"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/MP-7(1)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/MP-7(1)",
                                         "rel": "related",
                                         "text": "MP-7(1)"
                                     }
@@ -6008,27 +6008,27 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.8.2",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.8.2",
                                         "rel": "related",
                                         "text": "3.8.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/14.6",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/14.6",
                                         "rel": "related",
                                         "text": "14.6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-2",
                                         "rel": "related",
                                         "text": "PR.PT-2"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/MON:SG2.SP4",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/MON:SG2.SP4",
                                         "rel": "related",
                                         "text": "MON:SG2.SP4"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/MP-2",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/MP-2",
                                         "rel": "related",
                                         "text": "MP-2"
                                     }
@@ -6065,32 +6065,32 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.8.7",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.8.7",
                                         "rel": "related",
                                         "text": "3.8.7"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/13.7",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/13.7",
                                         "rel": "related",
                                         "text": "13.7"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/13.8",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/13.8",
                                         "rel": "related",
                                         "text": "13.8"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-2",
                                         "rel": "related",
                                         "text": "PR.PT-2"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/MON:SG2.SP4",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/MON:SG2.SP4",
                                         "rel": "related",
                                         "text": "MON:SG2.SP4"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/MP-7",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/MP-7",
                                         "rel": "related",
                                         "text": "MP-7"
                                     }
@@ -6127,27 +6127,27 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/FAR_Clause_52.204-21/b.1.vii",
+                                        "href": "/controls/catalogs/FAR_Clause_52.204-21/control/b.1.vii",
                                         "rel": "related",
                                         "text": "b.1.vii"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.8.3",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.8.3",
                                         "rel": "related",
                                         "text": "3.8.3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.DS-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.DS-3",
                                         "rel": "related",
                                         "text": "PR.DS-3"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/KIM:SG4.SP3",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/KIM:SG4.SP3",
                                         "rel": "related",
                                         "text": "KIM:SG4.SP3"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/MP-6",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/MP-6",
                                         "rel": "related",
                                         "text": "MP-6"
                                     }
@@ -6184,22 +6184,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.8.5",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.8.5",
                                         "rel": "related",
                                         "text": "3.8.5"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-2",
                                         "rel": "related",
                                         "text": "PR.PT-2"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/KIM:SG4.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/KIM:SG4.SP2",
                                         "rel": "related",
                                         "text": "KIM:SG4.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/MP-5",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/MP-5",
                                         "rel": "related",
                                         "text": "MP-5"
                                     }
@@ -6236,22 +6236,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.8.6",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.8.6",
                                         "rel": "related",
                                         "text": "3.8.6"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/13.9",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/13.9",
                                         "rel": "related",
                                         "text": "13.9"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/KIM:SG4.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/KIM:SG4.SP1",
                                         "rel": "related",
                                         "text": "KIM:SG4.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/MP-5(4)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/MP-5(4)",
                                         "rel": "related",
                                         "text": "MP-5(4)"
                                     }
@@ -6295,17 +6295,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.9.1",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.9.1",
                                         "rel": "related",
                                         "text": "3.9.1"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/HRM:SG2.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/HRM:SG2.SP1",
                                         "rel": "related",
                                         "text": "HRM:SG2.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/PS-3",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/PS-3",
                                         "rel": "related",
                                         "text": "PS-3"
                                     }
@@ -6342,27 +6342,27 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.9.2",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.9.2",
                                         "rel": "related",
                                         "text": "3.9.2"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-1",
                                         "rel": "related",
                                         "text": "PR.AC-1"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/HRM:SG4.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/HRM:SG4.SP2",
                                         "rel": "related",
                                         "text": "HRM:SG4.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/PS-4",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/PS-4",
                                         "rel": "related",
                                         "text": "PS-4"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/PS-5",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/PS-5",
                                         "rel": "related",
                                         "text": "PS-5"
                                     }
@@ -6406,27 +6406,27 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/FAR_Clause_52.204-21/b.1.viii",
+                                        "href": "/controls/catalogs/FAR_Clause_52.204-21/control/b.1.viii",
                                         "rel": "related",
                                         "text": "b.1.viii"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.10.1",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.10.1",
                                         "rel": "related",
                                         "text": "3.10.1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-2",
                                         "rel": "related",
                                         "text": "PR.AC-2"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/KIM:SG4.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/KIM:SG4.SP2",
                                         "rel": "related",
                                         "text": "KIM:SG4.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/PE-2",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/PE-2",
                                         "rel": "related",
                                         "text": "PE-2"
                                     }
@@ -6463,22 +6463,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.10.2",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.10.2",
                                         "rel": "related",
                                         "text": "3.10.2"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-2",
                                         "rel": "related",
                                         "text": "PR.AC-2"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/KIM:SG4.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/KIM:SG4.SP2",
                                         "rel": "related",
                                         "text": "KIM:SG4.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/PE-6",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/PE-6",
                                         "rel": "related",
                                         "text": "PE-6"
                                     }
@@ -6515,17 +6515,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.10.6",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.10.6",
                                         "rel": "related",
                                         "text": "3.10.6"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/EC:SG2.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/EC:SG2.SP1",
                                         "rel": "related",
                                         "text": "EC:SG2.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/PE-17",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/PE-17",
                                         "rel": "related",
                                         "text": "PE-17"
                                     }
@@ -6562,22 +6562,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/FAR_Clause_52.204-21/Partial b.1.ix",
+                                        "href": "/controls/catalogs/FAR_Clause_52.204-21/control/Partial b.1.ix",
                                         "rel": "related",
                                         "text": "Partial b.1.ix"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.10.3",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.10.3",
                                         "rel": "related",
                                         "text": "3.10.3"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/AM:SG1.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/AM:SG1.SP1",
                                         "rel": "related",
                                         "text": "AM:SG1.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/PE-3",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/PE-3",
                                         "rel": "related",
                                         "text": "PE-3"
                                     }
@@ -6614,17 +6614,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/FAR_Clause_52.204-21/Partial b.1.ix",
+                                        "href": "/controls/catalogs/FAR_Clause_52.204-21/control/Partial b.1.ix",
                                         "rel": "related",
                                         "text": "Partial b.1.ix"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.10.4",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.10.4",
                                         "rel": "related",
                                         "text": "3.10.4"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/PE-3",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/PE-3",
                                         "rel": "related",
                                         "text": "PE-3"
                                     }
@@ -6661,22 +6661,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/FAR_Clause_52.204-21/Partial b.1.ix",
+                                        "href": "/controls/catalogs/FAR_Clause_52.204-21/control/Partial b.1.ix",
                                         "rel": "related",
                                         "text": "Partial b.1.ix"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.10.5",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.10.5",
                                         "rel": "related",
                                         "text": "3.10.5"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/KIM:SG4.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/KIM:SG4.SP2",
                                         "rel": "related",
                                         "text": "KIM:SG4.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/PE-3",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/PE-3",
                                         "rel": "related",
                                         "text": "PE-3"
                                     }
@@ -6720,32 +6720,32 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/10.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/10.1",
                                         "rel": "related",
                                         "text": "10.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/10.3",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/10.3",
                                         "rel": "related",
                                         "text": "10.3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.IP-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.IP-4",
                                         "rel": "related",
                                         "text": "PR.IP-4"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/KIM:SG6.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/KIM:SG6.SP1",
                                         "rel": "related",
                                         "text": "KIM:SG6.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CP-9",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CP-9",
                                         "rel": "related",
                                         "text": "CP-9"
                                     },
                                     {
-                                        "href": "/controls/AU_ACSC/Essential Eight",
+                                        "href": "/controls/catalogs/AU_ACSC/control/Essential Eight",
                                         "rel": "related",
                                         "text": "Essential Eight"
                                     }
@@ -6782,32 +6782,32 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/10.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/10.1",
                                         "rel": "related",
                                         "text": "10.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/10.2",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/10.2",
                                         "rel": "related",
                                         "text": "10.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/10.5",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/10.5",
                                         "rel": "related",
                                         "text": "10.5"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/KIM:SG6.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/KIM:SG6.SP1",
                                         "rel": "related",
                                         "text": "KIM:SG6.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CP-9",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CP-9",
                                         "rel": "related",
                                         "text": "CP-9"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CP-9(3)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CP-9(3)",
                                         "rel": "related",
                                         "text": "CP-9(3)"
                                     }
@@ -6844,17 +6844,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.8.9",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.8.9",
                                         "rel": "related",
                                         "text": "3.8.9"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/MON:SG2.SP4",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/MON:SG2.SP4",
                                         "rel": "related",
                                         "text": "MON:SG2.SP4"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CP-9",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CP-9",
                                         "rel": "related",
                                         "text": "CP-9"
                                     }
@@ -6891,22 +6891,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.IP-9",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.IP-9",
                                         "rel": "related",
                                         "text": "PR.IP-9"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/RRM:SG1.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/RRM:SG1.SP2",
                                         "rel": "related",
                                         "text": "RRM:SG1.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CP-10",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CP-10",
                                         "rel": "related",
                                         "text": "CP-10"
                                     }
@@ -6950,37 +6950,37 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.11.1",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.11.1",
                                         "rel": "related",
                                         "text": "3.11.1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/ID.RA-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/ID.RA-1",
                                         "rel": "related",
                                         "text": "ID.RA-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/ID.RA-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/ID.RA-4",
                                         "rel": "related",
                                         "text": "ID.RA-4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.AE-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.AE-4",
                                         "rel": "related",
                                         "text": "DE.AE-4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/RS.MI-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/RS.MI-3",
                                         "rel": "related",
                                         "text": "RS.MI-3"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/RISK:SG4",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/RISK:SG4",
                                         "rel": "related",
                                         "text": "RISK:SG4"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/RA-3",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/RA-3",
                                         "rel": "related",
                                         "text": "RA-3"
                                     }
@@ -7017,22 +7017,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/ID.RA-5",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/ID.RA-5",
                                         "rel": "related",
                                         "text": "ID.RA-5"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/RISK:SG3",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/RISK:SG3",
                                         "rel": "related",
                                         "text": "RISK:SG3"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/RISK:SG4.SP3",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/RISK:SG4.SP3",
                                         "rel": "related",
                                         "text": "RISK:SG4.SP3"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/RA-3",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/RA-3",
                                         "rel": "related",
                                         "text": "RA-3"
                                     }
@@ -7069,17 +7069,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.AE-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.AE-2",
                                         "rel": "related",
                                         "text": "DE.AE-2"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/VAR:SG2.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/VAR:SG2.SP1",
                                         "rel": "related",
                                         "text": "VAR:SG2.SP1"
                                     }
@@ -7116,32 +7116,32 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.11.2",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.11.2",
                                         "rel": "related",
                                         "text": "3.11.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/3.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/3.1",
                                         "rel": "related",
                                         "text": "3.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/3.2",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/3.2",
                                         "rel": "related",
                                         "text": "3.2"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/ID.RA-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/ID.RA-1",
                                         "rel": "related",
                                         "text": "ID.RA-1"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/VAR:SG2.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/VAR:SG2.SP2",
                                         "rel": "related",
                                         "text": "VAR:SG2.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/RA-5",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/RA-5",
                                         "rel": "related",
                                         "text": "RA-5"
                                     }
@@ -7178,17 +7178,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/Draft_NIST_SP_800-171B/3.11.1e",
+                                        "href": "/controls/catalogs/Draft_NIST_SP_800-171B/control/3.11.1e",
                                         "rel": "related",
                                         "text": "3.11.1e"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/ID.RA-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/ID.RA-2",
                                         "rel": "related",
                                         "text": "ID.RA-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/ID.RA-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/ID.RA-3",
                                         "rel": "related",
                                         "text": "ID.RA-3"
                                     }
@@ -7225,12 +7225,12 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/12.2",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/12.2",
                                         "rel": "related",
                                         "text": "12.2"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-7",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-7",
                                         "rel": "related",
                                         "text": "DE.CM-7"
                                     }
@@ -7267,27 +7267,27 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.11.3",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.11.3",
                                         "rel": "related",
                                         "text": "3.11.3"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/3.7",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/3.7",
                                         "rel": "related",
                                         "text": "3.7"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/RS.MI-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/RS.MI-3",
                                         "rel": "related",
                                         "text": "RS.MI-3"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/VAR:SG3.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/VAR:SG3.SP1",
                                         "rel": "related",
                                         "text": "VAR:SG3.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/RA-5",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/RA-5",
                                         "rel": "related",
                                         "text": "RA-5"
                                     }
@@ -7324,22 +7324,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/ID.RA-6",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/ID.RA-6",
                                         "rel": "related",
                                         "text": "ID.RA-6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/ID.RM-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/ID.RM-1",
                                         "rel": "related",
                                         "text": "ID.RM-1"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/RISK:SG5.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/RISK:SG5.SP1",
                                         "rel": "related",
                                         "text": "RISK:SG5.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/PM-9",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/PM-9",
                                         "rel": "related",
                                         "text": "PM-9"
                                     }
@@ -7376,7 +7376,7 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     }
@@ -7413,17 +7413,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/2.2",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/2.2",
                                         "rel": "related",
                                         "text": "2.2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SA-22(1)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SA-22(1)",
                                         "rel": "related",
                                         "text": "SA-22(1)"
                                     }
@@ -7460,12 +7460,12 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC_modification_of_Draft_NIST_SP_800-171B/3.11.5e",
+                                        "href": "/controls/catalogs/CMMC_modification_of_Draft_NIST_SP_800-171B/control/3.11.5e",
                                         "rel": "related",
                                         "text": "3.11.5e"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/RISK:SG6.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/RISK:SG6.SP1",
                                         "rel": "related",
                                         "text": "RISK:SG6.SP1"
                                     }
@@ -7502,32 +7502,32 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC_modification_of_Draft_NIST_SP_800-171B/3.11.7e",
+                                        "href": "/controls/catalogs/CMMC_modification_of_Draft_NIST_SP_800-171B/control/3.11.7e",
                                         "rel": "related",
                                         "text": "3.11.7e"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/ID.SC-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/ID.SC-1",
                                         "rel": "related",
                                         "text": "ID.SC-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/ID.SC-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/ID.SC-2",
                                         "rel": "related",
                                         "text": "ID.SC-2"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/EC:SG3.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/EC:SG3.SP1",
                                         "rel": "related",
                                         "text": "EC:SG3.SP1"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/EC:SG3.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/EC:SG3.SP2",
                                         "rel": "related",
                                         "text": "EC:SG3.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SA-12",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SA-12",
                                         "rel": "related",
                                         "text": "SA-12"
                                     }
@@ -7571,17 +7571,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.12.4",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.12.4",
                                         "rel": "related",
                                         "text": "3.12.4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.IP-7",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.IP-7",
                                         "rel": "related",
                                         "text": "PR.IP-7"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/PL-2",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/PL-2",
                                         "rel": "related",
                                         "text": "PL-2"
                                     }
@@ -7618,32 +7618,32 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/ID.RM-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/ID.RM-1",
                                         "rel": "related",
                                         "text": "ID.RM-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/RS.IM-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/RS.IM-1",
                                         "rel": "related",
                                         "text": "RS.IM-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/RS.IM-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/RS.IM-2",
                                         "rel": "related",
                                         "text": "RS.IM-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/RC.IM-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/RC.IM-1",
                                         "rel": "related",
                                         "text": "RC.IM-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/and RC.IM-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/and RC.IM-2",
                                         "rel": "related",
                                         "text": "and RC.IM-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/PL-1",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/PL-1",
                                         "rel": "related",
                                         "text": "PL-1"
                                     }
@@ -7680,17 +7680,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.12.1",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.12.1",
                                         "rel": "related",
                                         "text": "3.12.1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.DP-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.DP-3",
                                         "rel": "related",
                                         "text": "DE.DP-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CA-2",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CA-2",
                                         "rel": "related",
                                         "text": "CA-2"
                                     }
@@ -7727,27 +7727,27 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.12.3",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.12.3",
                                         "rel": "related",
                                         "text": "3.12.3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.IP-7",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.IP-7",
                                         "rel": "related",
                                         "text": "PR.IP-7"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.DP-5",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.DP-5",
                                         "rel": "related",
                                         "text": "DE.DP-5"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/MON:SG1.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/MON:SG1.SP1",
                                         "rel": "related",
                                         "text": "MON:SG1.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CA-7",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CA-7",
                                         "rel": "related",
                                         "text": "CA-7"
                                     }
@@ -7784,17 +7784,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC_modification_of_Draft_NIST_SP_800-171B/3.12.1e",
+                                        "href": "/controls/catalogs/CMMC_modification_of_Draft_NIST_SP_800-171B/control/3.12.1e",
                                         "rel": "related",
                                         "text": "3.12.1e"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/20.2",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/20.2",
                                         "rel": "related",
                                         "text": "20.2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CA-8",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CA-8",
                                         "rel": "related",
                                         "text": "CA-8"
                                     }
@@ -7831,17 +7831,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.12.2",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.12.2",
                                         "rel": "related",
                                         "text": "3.12.2"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/RISK:SG5.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/RISK:SG5.SP1",
                                         "rel": "related",
                                         "text": "RISK:SG5.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CA-5",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CA-5",
                                         "rel": "related",
                                         "text": "CA-5"
                                     }
@@ -7878,17 +7878,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/20.3",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/20.3",
                                         "rel": "related",
                                         "text": "20.3"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/CA-8(2)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/CA-8(2)",
                                         "rel": "related",
                                         "text": "CA-8(2)"
                                     }
@@ -7925,17 +7925,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/18.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/18.1",
                                         "rel": "related",
                                         "text": "18.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/18.2",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/18.2",
                                         "rel": "related",
                                         "text": "18.2"
                                     }
@@ -7979,17 +7979,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/ID.RA-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/ID.RA-2",
                                         "rel": "related",
                                         "text": "ID.RA-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/PM-16",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/PM-16",
                                         "rel": "related",
                                         "text": "PM-16"
                                     }
@@ -8026,52 +8026,52 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/Draft_NIST_SP_800-171B/3.11.2e",
+                                        "href": "/controls/catalogs/Draft_NIST_SP_800-171B/control/3.11.2e",
                                         "rel": "related",
                                         "text": "3.11.2e"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-1",
                                         "rel": "related",
                                         "text": "DE.CM-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-2",
                                         "rel": "related",
                                         "text": "DE.CM-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-3",
                                         "rel": "related",
                                         "text": "DE.CM-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-4",
                                         "rel": "related",
                                         "text": "DE.CM-4"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-5",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-5",
                                         "rel": "related",
                                         "text": "DE.CM-5"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-6",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-6",
                                         "rel": "related",
                                         "text": "DE.CM-6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM.7",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM.7",
                                         "rel": "related",
                                         "text": "DE.CM.7"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-8",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-8",
                                         "rel": "related",
                                         "text": "DE.CM-8"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/PM-16",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/PM-16",
                                         "rel": "related",
                                         "text": "PM-16"
                                     }
@@ -8108,12 +8108,12 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SI-4(24)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SI-4(24)",
                                         "rel": "related",
                                         "text": "SI-4(24)"
                                     }
@@ -8157,17 +8157,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.13.12",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.13.12",
                                         "rel": "related",
                                         "text": "3.13.12"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-3",
                                         "rel": "related",
                                         "text": "PR.AC-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SC-15",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SC-15",
                                         "rel": "related",
                                         "text": "SC-15"
                                     }
@@ -8204,37 +8204,37 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.13.11",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.13.11",
                                         "rel": "related",
                                         "text": "3.13.11"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/14.4",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/14.4",
                                         "rel": "related",
                                         "text": "14.4"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/14.8",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/14.8",
                                         "rel": "related",
                                         "text": "14.8"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.DS-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.DS-1",
                                         "rel": "related",
                                         "text": "PR.DS-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.DS-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.DS-2",
                                         "rel": "related",
                                         "text": "PR.DS-2"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/KIM:SG4.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/KIM:SG4.SP1",
                                         "rel": "related",
                                         "text": "KIM:SG4.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SC-13",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SC-13",
                                         "rel": "related",
                                         "text": "SC-13"
                                     }
@@ -8271,17 +8271,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC_modification_of_Draft_NIST_SP_800-171B/3.13.4e",
+                                        "href": "/controls/catalogs/CMMC_modification_of_Draft_NIST_SP_800-171B/control/3.13.4e",
                                         "rel": "related",
                                         "text": "3.13.4e"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/14.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/14.1",
                                         "rel": "related",
                                         "text": "14.1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-5",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-5",
                                         "rel": "related",
                                         "text": "PR.AC-5"
                                     }
@@ -8318,7 +8318,7 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/12.5",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/12.5",
                                         "rel": "related",
                                         "text": "12.5"
                                     }
@@ -8355,12 +8355,12 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/11.5",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/11.5",
                                         "rel": "related",
                                         "text": "11.5"
                                     }
@@ -8397,27 +8397,27 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.13.2",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.13.2",
                                         "rel": "related",
                                         "text": "3.13.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/5.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/5.1",
                                         "rel": "related",
                                         "text": "5.1"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/5.2",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/5.2",
                                         "rel": "related",
                                         "text": "5.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/5.4",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/5.4",
                                         "rel": "related",
                                         "text": "5.4"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SA-8",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SA-8",
                                         "rel": "related",
                                         "text": "SA-8"
                                     }
@@ -8454,27 +8454,27 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC_modification_of_NIST_SP_800-171_Rev_1/3.13.2",
+                                        "href": "/controls/catalogs/CMMC_modification_of_NIST_SP-800-171_rev1/control/3.13.2",
                                         "rel": "related",
                                         "text": "3.13.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/11.7",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/11.7",
                                         "rel": "related",
                                         "text": "11.7"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/14.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/14.1",
                                         "rel": "related",
                                         "text": "14.1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-5",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-5",
                                         "rel": "related",
                                         "text": "PR.AC-5"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SA-8",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SA-8",
                                         "rel": "related",
                                         "text": "SA-8"
                                     }
@@ -8511,17 +8511,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/9.2",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/9.2",
                                         "rel": "related",
                                         "text": "9.2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SC-7(17)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SC-7(17)",
                                         "rel": "related",
                                         "text": "SC-7(17)"
                                     }
@@ -8558,27 +8558,27 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.13.3",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.13.3",
                                         "rel": "related",
                                         "text": "3.13.3"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/4.3",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/4.3",
                                         "rel": "related",
                                         "text": "4.3"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/KIM:SG2.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/KIM:SG2.SP2",
                                         "rel": "related",
                                         "text": "KIM:SG2.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SC-2",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SC-2",
                                         "rel": "related",
                                         "text": "SC-2"
                                     },
                                     {
-                                        "href": "/controls/AU_ACSC/Essential Eight",
+                                        "href": "/controls/catalogs/AU_ACSC/control/Essential Eight",
                                         "rel": "related",
                                         "text": "Essential Eight"
                                     }
@@ -8615,12 +8615,12 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.13.4",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.13.4",
                                         "rel": "related",
                                         "text": "3.13.4"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SC-4",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SC-4",
                                         "rel": "related",
                                         "text": "SC-4"
                                     }
@@ -8657,12 +8657,12 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.13.6",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.13.6",
                                         "rel": "related",
                                         "text": "3.13.6"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SC-7(5)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SC-7(5)",
                                         "rel": "related",
                                         "text": "SC-7(5)"
                                     }
@@ -8699,22 +8699,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.13.7",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.13.7",
                                         "rel": "related",
                                         "text": "3.13.7"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/12.12",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/12.12",
                                         "rel": "related",
                                         "text": "12.12"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-3",
                                         "rel": "related",
                                         "text": "PR.AC-3"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SC-7(7)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SC-7(7)",
                                         "rel": "related",
                                         "text": "SC-7(7)"
                                     }
@@ -8751,22 +8751,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.13.8",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.13.8",
                                         "rel": "related",
                                         "text": "3.13.8"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-2",
                                         "rel": "related",
                                         "text": "PR.AC-2"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/KIM:SG4.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/KIM:SG4.SP1",
                                         "rel": "related",
                                         "text": "KIM:SG4.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SC-8(1)",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SC-8(1)",
                                         "rel": "related",
                                         "text": "SC-8(1)"
                                     }
@@ -8803,12 +8803,12 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.13.9",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.13.9",
                                         "rel": "related",
                                         "text": "3.13.9"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SC-10",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SC-10",
                                         "rel": "related",
                                         "text": "SC-10"
                                     }
@@ -8845,17 +8845,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.13.10",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.13.10",
                                         "rel": "related",
                                         "text": "3.13.10"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/KIM:SG4.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/KIM:SG4.SP1",
                                         "rel": "related",
                                         "text": "KIM:SG4.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SC-12",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SC-12",
                                         "rel": "related",
                                         "text": "SC-12"
                                     }
@@ -8892,22 +8892,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.13.13",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.13.13",
                                         "rel": "related",
                                         "text": "3.13.13"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-5",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-5",
                                         "rel": "related",
                                         "text": "DE.CM-5"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SC-18",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SC-18",
                                         "rel": "related",
                                         "text": "SC-18"
                                     },
                                     {
-                                        "href": "/controls/AU_ACSC/Essential Eight",
+                                        "href": "/controls/catalogs/AU_ACSC/control/Essential Eight",
                                         "rel": "related",
                                         "text": "Essential Eight"
                                     }
@@ -8944,12 +8944,12 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.13.14",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.13.14",
                                         "rel": "related",
                                         "text": "3.13.14"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SC-19",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SC-19",
                                         "rel": "related",
                                         "text": "SC-19"
                                     }
@@ -8986,12 +8986,12 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.13.15",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.13.15",
                                         "rel": "related",
                                         "text": "3.13.15"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SC-23",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SC-23",
                                         "rel": "related",
                                         "text": "SC-23"
                                     }
@@ -9028,22 +9028,22 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.13.16",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.13.16",
                                         "rel": "related",
                                         "text": "3.13.16"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/14.8",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/14.8",
                                         "rel": "related",
                                         "text": "14.8"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.DS-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.DS-1",
                                         "rel": "related",
                                         "text": "PR.DS-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SC-28",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SC-28",
                                         "rel": "related",
                                         "text": "SC-28"
                                     }
@@ -9080,27 +9080,27 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/FAR_Clause_52.204-21/b.1.x",
+                                        "href": "/controls/catalogs/FAR_Clause_52.204-21/control/b.1.x",
                                         "rel": "related",
                                         "text": "b.1.x"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.13.1",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.13.1",
                                         "rel": "related",
                                         "text": "3.13.1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.PT-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.PT-4",
                                         "rel": "related",
                                         "text": "PR.PT-4"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SC-7",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SC-7",
                                         "rel": "related",
                                         "text": "SC-7"
                                     },
                                     {
-                                        "href": "/controls/UK_NCSC_Cyber_Essentials/~",
+                                        "href": "/controls/catalogs/UK_NCSC_Cyber_Essentials/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     }
@@ -9137,17 +9137,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/7.7",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/7.7",
                                         "rel": "related",
                                         "text": "7.7"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SC-20",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SC-20",
                                         "rel": "related",
                                         "text": "SC-20"
                                     }
@@ -9184,7 +9184,7 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     }
@@ -9221,7 +9221,7 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     }
@@ -9258,32 +9258,32 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/FAR_Clause_52.204-21/b.1.xi",
+                                        "href": "/controls/catalogs/FAR_Clause_52.204-21/control/b.1.xi",
                                         "rel": "related",
                                         "text": "b.1.xi"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.13.5",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.13.5",
                                         "rel": "related",
                                         "text": "3.13.5"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/14.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/14.1",
                                         "rel": "related",
                                         "text": "14.1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.AC-5",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.AC-5",
                                         "rel": "related",
                                         "text": "PR.AC-5"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SC-7",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SC-7",
                                         "rel": "related",
                                         "text": "SC-7"
                                     },
                                     {
-                                        "href": "/controls/UK_NCSC_Cyber_Essentials/~",
+                                        "href": "/controls/catalogs/UK_NCSC_Cyber_Essentials/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     }
@@ -9320,7 +9320,7 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     }
@@ -9357,12 +9357,12 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SC-44",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SC-44",
                                         "rel": "related",
                                         "text": "SC-44"
                                     }
@@ -9399,12 +9399,12 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/7.4",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/7.4",
                                         "rel": "related",
                                         "text": "7.4"
                                     }
@@ -9448,42 +9448,42 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/FAR_Clause_52.204-21/b.1.xii",
+                                        "href": "/controls/catalogs/FAR_Clause_52.204-21/control/b.1.xii",
                                         "rel": "related",
                                         "text": "b.1.xii"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.14.1",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.14.1",
                                         "rel": "related",
                                         "text": "3.14.1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/RS.CO-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/RS.CO-2",
                                         "rel": "related",
                                         "text": "RS.CO-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/RS.MI-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/RS.MI-3",
                                         "rel": "related",
                                         "text": "RS.MI-3"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/VAR:SG2.SP2",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/VAR:SG2.SP2",
                                         "rel": "related",
                                         "text": "VAR:SG2.SP2"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SI-2",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SI-2",
                                         "rel": "related",
                                         "text": "SI-2"
                                     },
                                     {
-                                        "href": "/controls/UK_NCSC_Cyber_Essentials/~",
+                                        "href": "/controls/catalogs/UK_NCSC_Cyber_Essentials/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     },
                                     {
-                                        "href": "/controls/AU_ACSC/Essential Eight",
+                                        "href": "/controls/catalogs/AU_ACSC/control/Essential Eight",
                                         "rel": "related",
                                         "text": "Essential Eight"
                                     }
@@ -9520,32 +9520,32 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.14.3",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.14.3",
                                         "rel": "related",
                                         "text": "3.14.3"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/6.5",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/6.5",
                                         "rel": "related",
                                         "text": "6.5"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/6.6",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/6.6",
                                         "rel": "related",
                                         "text": "6.6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/RS.AN-5",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/RS.AN-5",
                                         "rel": "related",
                                         "text": "RS.AN-5"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/IMC:SG2.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/IMC:SG2.SP1",
                                         "rel": "related",
                                         "text": "IMC:SG2.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SI-5",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SI-5",
                                         "rel": "related",
                                         "text": "SI-5"
                                     }
@@ -9582,17 +9582,17 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/Draft_NIST_SP_800-171B/3.14.6e",
+                                        "href": "/controls/catalogs/Draft_NIST_SP_800-171B/control/3.14.6e",
                                         "rel": "related",
                                         "text": "3.14.6e"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/ID.RA-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/ID.RA-2",
                                         "rel": "related",
                                         "text": "ID.RA-2"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/ID.RA-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/ID.RA-3",
                                         "rel": "related",
                                         "text": "ID.RA-3"
                                     }
@@ -9629,37 +9629,37 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/FAR_Clause_52.204-21/b.1.xiii",
+                                        "href": "/controls/catalogs/FAR_Clause_52.204-21/control/b.1.xiii",
                                         "rel": "related",
                                         "text": "b.1.xiii"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.14.2",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.14.2",
                                         "rel": "related",
                                         "text": "3.14.2"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/8.1",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/8.1",
                                         "rel": "related",
                                         "text": "8.1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-4",
                                         "rel": "related",
                                         "text": "DE.CM-4"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/VAR:SG3.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/VAR:SG3.SP1",
                                         "rel": "related",
                                         "text": "VAR:SG3.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SI-3",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SI-3",
                                         "rel": "related",
                                         "text": "SI-3"
                                     },
                                     {
-                                        "href": "/controls/AU_ACSC/Essential Eight",
+                                        "href": "/controls/catalogs/AU_ACSC/control/Essential Eight",
                                         "rel": "related",
                                         "text": "Essential Eight"
                                     }
@@ -9696,7 +9696,7 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     }
@@ -9733,32 +9733,32 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/FAR_Clause_52.204-21/b.1.xiv",
+                                        "href": "/controls/catalogs/FAR_Clause_52.204-21/control/b.1.xiv",
                                         "rel": "related",
                                         "text": "b.1.xiv"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.14.4",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.14.4",
                                         "rel": "related",
                                         "text": "3.14.4"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/8.2",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/8.2",
                                         "rel": "related",
                                         "text": "8.2"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-4",
                                         "rel": "related",
                                         "text": "DE.CM-4"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/VAR:SG3.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/VAR:SG3.SP1",
                                         "rel": "related",
                                         "text": "VAR:SG3.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SI-3",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SI-3",
                                         "rel": "related",
                                         "text": "SI-3"
                                     }
@@ -9795,37 +9795,37 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/FAR_Clause_52.204-21/b.1.xv",
+                                        "href": "/controls/catalogs/FAR_Clause_52.204-21/control/b.1.xv",
                                         "rel": "related",
                                         "text": "b.1.xv"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.14.5",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.14.5",
                                         "rel": "related",
                                         "text": "3.14.5"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/8.4",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/8.4",
                                         "rel": "related",
                                         "text": "8.4"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/8.7",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/8.7",
                                         "rel": "related",
                                         "text": "8.7"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-4",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-4",
                                         "rel": "related",
                                         "text": "DE.CM-4"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/VAR:SG3.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/VAR:SG3.SP1",
                                         "rel": "related",
                                         "text": "VAR:SG3.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SI-3",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SI-3",
                                         "rel": "related",
                                         "text": "SI-3"
                                     }
@@ -9862,27 +9862,27 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.14.6",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.14.6",
                                         "rel": "related",
                                         "text": "3.14.6"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/12.6",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/12.6",
                                         "rel": "related",
                                         "text": "12.6"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-1",
                                         "rel": "related",
                                         "text": "DE.CM-1"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/MON:SG1.SP3",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/MON:SG1.SP3",
                                         "rel": "related",
                                         "text": "MON:SG1.SP3"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SI-4",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SI-4",
                                         "rel": "related",
                                         "text": "SI-4"
                                     }
@@ -9919,12 +9919,12 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SI-8",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SI-8",
                                         "rel": "related",
                                         "text": "SI-8"
                                     }
@@ -9961,42 +9961,42 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/Draft_NIST_SP_800-171B/3.14.2e",
+                                        "href": "/controls/catalogs/Draft_NIST_SP_800-171B/control/3.14.2e",
                                         "rel": "related",
                                         "text": "3.14.2e"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/13.3",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/13.3",
                                         "rel": "related",
                                         "text": "13.3"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.12",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.12",
                                         "rel": "related",
                                         "text": "16.12"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/16.13",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/16.13",
                                         "rel": "related",
                                         "text": "16.13"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-1",
                                         "rel": "related",
                                         "text": "DE.CM-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-3",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-3",
                                         "rel": "related",
                                         "text": "DE.CM-3"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/MON:SG1.SP3",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/MON:SG1.SP3",
                                         "rel": "related",
                                         "text": "MON:SG1.SP3"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SI-4",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SI-4",
                                         "rel": "related",
                                         "text": "SI-4"
                                     }
@@ -10033,27 +10033,27 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/NIST_SP_800-171_Rev_1/3.14.7",
+                                        "href": "/controls/catalogs/NIST_SP-800-171_rev1/control/3.14.7",
                                         "rel": "related",
                                         "text": "3.14.7"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-1",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-1",
                                         "rel": "related",
                                         "text": "DE.CM-1"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/DE.CM-7",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/DE.CM-7",
                                         "rel": "related",
                                         "text": "DE.CM-7"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/MON:SG1.SP3",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/MON:SG1.SP3",
                                         "rel": "related",
                                         "text": "MON:SG1.SP3"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SI-4",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SI-4",
                                         "rel": "related",
                                         "text": "SI-4"
                                     }
@@ -10090,27 +10090,27 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CMMC/~",
+                                        "href": "/controls/catalogs/CMMC/control/~",
                                         "rel": "related",
                                         "text": "~"
                                     },
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/7.8",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/7.8",
                                         "rel": "related",
                                         "text": "7.8"
                                     },
                                     {
-                                        "href": "/controls/NIST_CSF_v1.1/PR.DS-2",
+                                        "href": "/controls/catalogs/NIST_CSF_v1.1/control/PR.DS-2",
                                         "rel": "related",
                                         "text": "PR.DS-2"
                                     },
                                     {
-                                        "href": "/controls/CERT_RMM_v1.2/KIM:SG4.SP1",
+                                        "href": "/controls/catalogs/CERT_RMM_v1.2/control/KIM:SG4.SP1",
                                         "rel": "related",
                                         "text": "KIM:SG4.SP1"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SC-8",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SC-8",
                                         "rel": "related",
                                         "text": "SC-8"
                                     }
@@ -10147,12 +10147,12 @@
                                 "prose": "",
                                 "links": [
                                     {
-                                        "href": "/controls/CIS_Controls_v7.1/7.10",
+                                        "href": "/controls/catalogs/CIS_Controls_v7.1/control/7.10",
                                         "rel": "related",
                                         "text": "7.10"
                                     },
                                     {
-                                        "href": "/controls/NIST_SP_800-53_Rev_4/SC-44",
+                                        "href": "/controls/catalogs/NIST_SP-800-53_rev4/control/SC-44",
                                         "rel": "related",
                                         "text": "SC-44"
                                     }
diff --git a/controls/models.py b/controls/models.py
index 043ee2fc3..a3d8ab798 100644
--- a/controls/models.py
+++ b/controls/models.py
@@ -798,7 +798,8 @@ def _list_files(self):
         return self.extend_external_baselines([
             'NIST_SP-800-53_rev4_baselines.json',
             # 'NIST_SP-800-53_rev5_baselines.json',
-            'NIST_SP-800-171_rev1_baselines.json'
+            'NIST_SP-800-171_rev1_baselines.json',
+            'CMMC_ver1_baselines.json'
         ], "files")
 
 
@@ -806,7 +807,8 @@ def _list_keys(self):
         return self.extend_external_baselines([
             'NIST_SP-800-53_rev4',
             # 'NIST_SP-800-53_rev5',
-            'NIST_SP-800-171_rev1'
+            'NIST_SP-800-171_rev1',
+            'CMMC_ver1'
         ], "keys")
 
 
@@ -860,6 +862,7 @@ def extend_external_baselines(self, baseline_info, extendtype):
 
         baseline_info = check_and_extend(baseline_info, external_baselines, extendtype, "_baselines")
         return baseline_info
+
 class OrgParams(object):
     """
     Represent list of organizational defined parameters. Temporary
diff --git a/controls/oscal.py b/controls/oscal.py
index e9132f8ed..adb93c605 100644
--- a/controls/oscal.py
+++ b/controls/oscal.py
@@ -156,19 +156,21 @@ def __init__(self, catalog_key=Catalogs.NIST_SP_800_53_rev4, parameter_values=di
     def _load_catalog_json(self):
         """Read catalog file - JSON"""
         catalog_file = os.path.join(self.catalog_path, self.catalog_file)
-        # Does file exist?
-        if not os.path.isfile(catalog_file):
-            # Check if there any external oscal catalog files
-            try:
-                catalog_file = os.path.join(self.external_catalog_path, self.catalog_file)
-            except:
-                print(f"ERROR: {catalog_file} does not exist")
-                return False
-        # Load file as json
-        with open(catalog_file, 'r') as json_file:
-            data = json.load(json_file)
-            oscal = data['catalog']
-        return oscal
+        catalog_file_external = os.path.join(self.external_catalog_path, self.catalog_file)
+        # Get catalog file from internal or "external" catalog files
+        if os.path.isfile(catalog_file):
+            with open(catalog_file, 'r') as json_file:
+                data = json.load(json_file)
+                oscal = data['catalog']
+            return oscal
+        elif os.path.isfile(catalog_file_external):
+            with open(catalog_file, 'r') as json_file:
+                data = json.load(json_file)
+                oscal = data['catalog']
+            return oscal
+        else:
+            # Catalog file doesn't exist
+            return False
 
     def find_dict_by_value(self, search_array, search_key, search_value):
         """Return the dictionary in an array of dictionaries with a key matching a value"""
@@ -180,7 +182,10 @@ def find_dict_by_value(self, search_array, search_key, search_value):
     #     return [item['id'] for item in search_collection if 'id' in item]
 
     def get_groups(self):
-        return self.oscal['groups']
+        if "groups" in self.oscal:
+            return self.oscal['groups']
+        else:
+            return None
 
     def get_group_ids(self):
         search_collection = self.get_groups()
@@ -242,6 +247,32 @@ def get_control_property_by_name(self, control, property_name):
             return None
         return prop['value']
 
+    def get_control_part_by_name(self, control, part_name):
+        """Return value of a part of a control by name of part"""
+        if "parts" in control:
+            part = self.find_dict_by_value(control['parts'], "name", part_name)
+            return part
+        else:
+            return None
+
+    def get_control_guidance_links(self, control):
+        """Return the links in the guidance section of a control"""
+        guidance = self.get_control_part_by_name(control, "guidance")
+        if guidance and "links" in guidance:
+            return guidance["links"]
+        else:
+            return []
+
+    def get_guidance_related_links_by_value_in_href(self, control, value):
+        """Return objects from 'rel': 'related' links with particular value found in the 'href' string"""
+        links = [ l for l in self.get_control_guidance_links(control) if l['rel']=="related" and value in l['href'] ]
+        return links
+
+    def get_guidance_related_links_text_by_value_in_href(self, control, value):
+        """Return 'text' from rel': 'related' links with particular value found in the 'href' string"""
+        links_text = [ l['text'] for l in self.get_control_guidance_links(control) if l['rel']=="related" and value in l['href'] ]
+        return links_text
+
     def get_control_parameter_label_by_id(self, control, param_id):
         """Return value of a parameter of a control by id of parameter"""
         param = self.find_dict_by_value(control['parameters'], "id", param_id)
@@ -377,7 +408,8 @@ def get_flattened_control_as_dict(self, control):
             "catalog_key": self.catalog_file.split('_catalog.json')[0],
             "catalog_id": self.catalog_id,
             "sort_id": self.get_control_property_by_name(control, "sort-id"),
-            "label": self.get_control_property_by_name(control, "label")
+            "label": self.get_control_property_by_name(control, "label"),
+            "guidance_links": self.get_control_guidance_links(control)
         }
         return cl_dict
 
@@ -402,6 +434,7 @@ def get_flattened_controls_all_as_dict_list(self):
             cl_dict = self.get_flattened_control_as_dict(cl)
             cl_all_list.append(cl_dict)
         return cl_all_list
+
     def _cache_parameters_by_control(self):
         cache = defaultdict(list)
         if self.oscal:
diff --git a/controls/views.py b/controls/views.py
index 4bbf12512..055c9c7a3 100644
--- a/controls/views.py
+++ b/controls/views.py
@@ -125,6 +125,15 @@ def control(request, catalog_key, cl_id):
     # Get catalog
     catalog = Catalog(catalog_key)
     cg_flat = catalog.get_flattened_controls_all_as_dict()
+    # Prepare links
+    links = []
+    for link in cg_flat[cl_id.lower()]['guidance_links']:
+        link['href_split'] = link['href'].split("/")
+        if len(link['href_split']) == 6:
+            link['catalog'] = link['href_split'][3].replace("_"," ")
+        else:
+            link['catalog'] = None
+        links.append(link)
 
     # Handle properly formatted control id that does not exist
     if cl_id.lower() not in cg_flat:
@@ -133,6 +142,7 @@ def control(request, catalog_key, cl_id):
     context = {
         "catalog": catalog,
         "control": cg_flat[cl_id.lower()],
+        "links": links,
     }
     return render(request, "controls/detail.html", context)
 
@@ -166,7 +176,7 @@ def controls_selected(request, system_id):
         # Get list of catalog objects
         catalog_list = Catalogs().list_catalogs()
         # Remove the 3 nist catalogs that are hard-coded already in template
-        external_catalogs = [catalog for catalog in catalog_list if catalog.catalog_key not in ['NIST_SP-800-53_rev4', 'NIST_SP-800-53_rev5', 'NIST_SP-800-171_rev1' ]]
+        external_catalogs = [catalog for catalog in catalog_list if catalog.catalog_key not in ['NIST_SP-800-53_rev4', 'NIST_SP-800-53_rev5', 'NIST_SP-800-171_rev1', 'CMMC_ver1' ]]
 
         # Return the controls
         context = {
@@ -1818,7 +1828,6 @@ def save_smt(request):
         form_values = {}
         for key in form_dict.keys():
             form_values[key] = form_dict[key][0]
-        print(form_dict)
         smt_id = form_values['smt_id']
         # Updating or saving a new statement?
         if len(smt_id) > 0:
@@ -1854,13 +1863,14 @@ def save_smt(request):
             else:
                 new_statement = True
         else:
+            new_statement_type_enum = StatementTypeEnum[form_values['statement_type'].upper()]
             # Create new Statement object
             statement = Statement(
                 sid=oscalize_control_id(form_values['sid']),
                 sid_class=form_values['sid_class'],
                 body=form_values['body'],
                 pid=form_values['pid'],
-                statement_type=form_values['statement_type'],
+                statement_type=new_statement_type_enum.name,
                 status=form_values['status'],
                 remarks=form_values['remarks'],
             )
@@ -1889,7 +1899,7 @@ def save_smt(request):
         if new_statement:
             try:
                 statement.producer_element = producer_element
-                #statement.save()
+                statement.save()
                 statement_element_status = "ok"
                 statement_element_msg = "Statement associated with Producer Element."
                 messages.add_message(request, messages.INFO, f"{statement_element_msg} {producer_element.id}.")
diff --git a/templates/controls/detail.html b/templates/controls/detail.html
index afdf4e383..ddb1db9e0 100644
--- a/templates/controls/detail.html
+++ b/templates/controls/detail.html
@@ -63,7 +63,20 @@ <h2 id="control-heading" class="">
       <div id="tab-content" class="row row-control" style="">
         <div id="" class="col-xs-11 col-sm-11 col-md-11 col-lg-11 col-xl-11">
           <div id="control-description" class="control-text"><h3>Description</h3>{% if control.description %}{{ control.description }}{% else %}No description provided.{% endif %}</div>
-          <div id="control-guidance"  class="control-text"><h3>Guidance</h3>{% if control.guidance %}{{ control.guidance }}{% else %}No guidance provided.{% endif %}</div>
+          <div id="control-guidance" class="control-text"><h3>Guidance</h3>{% if control.guidance %}{{ control.guidance }}{% else %}No guidance provided.{% endif %}
+          </div>
+          <div id="control-guidance"  class="">
+            <h4>Links</h4>
+            {% if links %}
+            <ul>
+              {% for link in links %}
+                <li><a href="{{ link.href }}" target="_blank">{{ link.catalog }} {{ link.text }}</a></li>
+              {% endfor %}
+            </ul>
+            {% else %}
+              No links provided.
+            {% endif %}
+          </div>
         </div>
       </div>
       {% else %}
diff --git a/templates/systems/controls_selected.html b/templates/systems/controls_selected.html
index 6b7997ecc..a346ae9cd 100644
--- a/templates/systems/controls_selected.html
+++ b/templates/systems/controls_selected.html
@@ -46,14 +46,21 @@
     {% if controls|length < 1 %}
       <div id="tab-content" class="row row-control">
         <div id="" class="col-xs-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
-          <p>No controls are currently selected for this system.</p>
-          <p>FEATURE NOTE: We are automating the assigning of control baselines by system categorization.
-          Prior to feature completion, we humbly ask you manually select the desired control baseline...</p>
+          <p>No controls are currently selected for your system.</p>
+          <p>An appropriate baseline will be assigned based on your questionnaire answers. Alternatively, you can predictively assign a control baseline from the list below.</p>
           <ul>
             <li><a href={% url 'assign_baseline' system_id=system.id catalog_key='NIST_SP-800-53_rev4' baseline_name='low' %}>Assign 800-53 rev4 Low Impact Baseline</a></li>
             <li><a href={% url 'assign_baseline' system_id=system.id catalog_key='NIST_SP-800-53_rev4' baseline_name='moderate' %}>Assign 800-53 rev4 Moderate Impact Baseline</a></li>
             <li><a href={% url 'assign_baseline' system_id=system.id catalog_key='NIST_SP-800-53_rev4' baseline_name='high' %}>Assign 800-53 rev4 High Impact Baseline</a></li>
+            <br>
             <li><a href={% url 'assign_baseline' system_id=system.id catalog_key='NIST_SP-800-171_rev1' baseline_name='cui' %}>Assign 800-171 rev1 Baseline</a></li>
+            <br>
+            <li><a href={% url 'assign_baseline' system_id=system.id catalog_key='CMMC_ver1' baseline_name='level 1' %}>Assign CMMC ver1 level 1 Baseline</a></li>
+            <li><a href={% url 'assign_baseline' system_id=system.id catalog_key='CMMC_ver1' baseline_name='level 2' %}>Assign CMMC ver1 level 2 Baseline</a></li>
+            <li><a href={% url 'assign_baseline' system_id=system.id catalog_key='CMMC_ver1' baseline_name='level 3' %}>Assign CMMC ver1 level 3 Baseline</a></li>
+            <li><a href={% url 'assign_baseline' system_id=system.id catalog_key='CMMC_ver1' baseline_name='level 4' %}>Assign CMMC ver1 level 4 Baseline</a></li>
+            <li><a href={% url 'assign_baseline' system_id=system.id catalog_key='CMMC_ver1' baseline_name='level 5' %}>Assign CMMC ver1 level 5 Baseline</a></li>
+
               {% for catalog in external_catalogs %}
                               <li><a href={% url 'assign_baseline' system_id=system.id catalog_key=catalog.catalog_key  baseline_name='low' %}>Assign {{ catalog.catalog_key_display }} Low Impact Baseline</a></li>
                               <li><a href={% url 'assign_baseline' system_id=system.id catalog_key=catalog.catalog_key  baseline_name='moderate' %}>Assign {{ catalog.catalog_key_display }} Moderate Impact Baseline</a></li>