diff --git a/src/blocks/Listing/index.js b/src/blocks/Listing/index.js
index 9a714c5e..bb74b075 100644
--- a/src/blocks/Listing/index.js
+++ b/src/blocks/Listing/index.js
@@ -32,7 +32,10 @@ const applyConfig = (config) => {
   if (config.settings.integratesBlockStyles)
     config.settings.integratesBlockStyles.push('listing');
 
-  listing.schemaEnhancer = moveQueryToFieldset(listing.schemaEnhancer);
+  listing.schemaEnhancer = composeSchema(
+    moveQueryToFieldset,
+    listing.schemaEnhancer,
+  );
 
   // The split of responsibilities is as follows:
   // the Listing block variation takes care of the Layout responsibility (how
@@ -130,9 +133,8 @@ const applyConfig = (config) => {
 
 export default applyConfig;
 
-const moveQueryToFieldset = (schemaEnhancer) => (props) => {
+const moveQueryToFieldset = ({ schema }) => {
   // NOTE: this is a schema finalizer
-  const schema = schemaEnhancer ? schemaEnhancer(props) : props.schema;
 
   // move querystring to its own fieldset;
   schema.fieldsets[0].fields = schema.fieldsets[0].fields.filter(
diff --git a/src/blocks/Teaser/index.js b/src/blocks/Teaser/index.js
index 1a402480..81aa1082 100644
--- a/src/blocks/Teaser/index.js
+++ b/src/blocks/Teaser/index.js
@@ -4,11 +4,7 @@ import { addStyling } from '@plone/volto/helpers';
 import TeaserCardTemplate from './Card';
 import { adjustTeaserSchema } from './schema';
 import UniversalCard from '@eeacms/volto-listing-block/components/UniversalCard/UniversalCard';
-import {
-  // setCardStylingSchema,
-  // setCardModelSchema,
-  setBasicStylingSchema,
-} from '../Listing/schema';
+import { setBasicStylingSchema } from '../Listing/schema';
 
 export default (config) => {
   if (config.blocks.blocksConfig.teaser) {
@@ -27,8 +23,6 @@ export default (config) => {
         schemaEnhancer: composeSchema(
           adjustTeaserSchema,
           UniversalCard.schemaEnhancer,
-          // setCardModelSchema,
-          // setCardStylingSchema,
         ),
       },
       // ...(config.blocks.blocksConfig.teaser.variations || []),