1 files changed, 14 insertions, 1 deletions
diff --git a/src/data/composite/wiki-data/splitContentNodesAround.js b/src/data/composite/wiki-data/splitContentNodesAround.js
index 6648d8e1..f12bd8fc 100644
--- a/src/data/composite/wiki-data/splitContentNodesAround.js
+++ b/src/data/composite/wiki-data/splitContentNodesAround.js
@@ -2,6 +2,7 @@ import {input, templateCompositeFrom} from '#composite';
 import {splitContentNodesAround} from '#replacer';
 import {anyOf, isFunction, validateInstanceOf} from '#validators';
 
+import {withAvailabilityFilter} from '#composite/control-flow';
 import {withFilteredList, withMappedList, withUnflattenedList}
   from '#composite/data';
 
@@ -41,8 +42,8 @@ export default templateCompositeFrom({
 
     withMappedList({
       list: '#separatorFilter',
-      filter: '#separatorFilter',
       map: input.value((_node, index) => index),
+      filter: '#separatorFilter',
     }),
 
     withFilteredList({
@@ -83,5 +84,17 @@ export default templateCompositeFrom({
     }).outputs({
       '#unflattenedList': '#contentNodeLists',
     }),
+
+    withAvailabilityFilter({
+      from: '#contentNodeLists',
+      mode: input.value('empty'),
+    }),
+
+    withFilteredList({
+      list: '#contentNodeLists',
+      filter: '#availabilityFilter',
+    }).outputs({
+      '#filteredList': '#contentNodeLists',
+    }),
   ],
 });