diff --git a/server/api/search.ts b/server/api/search.ts
index ee297bbe..62035727 100644
--- a/server/api/search.ts
+++ b/server/api/search.ts
@@ -2122,7 +2122,6 @@ async function addToSearchQueryCache(query: string, scope: string) {
       orgID: process.env.ORG_ID,
     })
 
-    // @ts-ignore
     if(!org?.FEAT_RecordSearchQueries) return true; // Check if feature flag is enabled
 
     searchQueryCache.push({
diff --git a/server/models/organization.ts b/server/models/organization.ts
index 6c245afb..57a7d2be 100644
--- a/server/models/organization.ts
+++ b/server/models/organization.ts
@@ -39,6 +39,9 @@ export interface OrganizationInterface extends Document {
   commonsModules?: CommonsModuleSettings;
   showCollections?: boolean;
   assetFilterExclusions?: string[];
+  FEAT_AssetTagsManager?: boolean;
+  FEAT_PedagogyProjectTags?: boolean;
+  FEAT_RecordSearchQueries?: boolean;
 }
 
 const OrganizationSchema = new Schema<OrganizationInterface>(
@@ -184,6 +187,18 @@ const OrganizationSchema = new Schema<OrganizationInterface>(
      * Inherent asset filters that should not be displayed in the Commons.
      */
     assetFilterExclusions: [String],
+    /**
+     * Whether the Asset Tags Manager feature is enabled.
+     */
+    FEAT_AssetTagsManager: Boolean,
+    /**
+     * Whether the Pedagogy Project Tags feature is enabled.
+     */
+    FEAT_PedagogyProjectTags: Boolean,
+    /**
+     * Whether the Record Search Queries feature is enabled.
+     */
+    FEAT_RecordSearchQueries: Boolean,
   },
   {
     timestamps: true,