diff --git a/src/advancedSchema.js b/src/advancedSchema.js
index 9755f39..41b8f95 100644
--- a/src/advancedSchema.js
+++ b/src/advancedSchema.js
@@ -20,16 +20,16 @@ export const advancedSchema = (props) => {
           },
         ]
       : [];
+  const include_fieldsets = ['default', 'searchquery', 'facets', 'controls'];
 
   return {
     ...schema,
     fieldsets: [
       ...(schema.fieldsets &&
         schema.fieldsets.length > 0 &&
-        schema.fieldsets.filter((fieldset) => fieldset.id === 'default')),
-      ...(schema.fieldsets &&
-        schema.fieldsets.length > 0 &&
-        schema.fieldsets.filter((fieldset) => fieldset.id === 'searchquery')),
+        schema.fieldsets.filter((fieldset) =>
+          include_fieldsets.includes(fieldset.id),
+        )),
       ...heading,
       {
         id: 'columns',