diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/mapper/TaasDocumentDataMapper.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/mapper/TaasDocumentDataMapper.java
index a610d4e..d17f9c3 100644
--- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/mapper/TaasDocumentDataMapper.java
+++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/services/mapper/TaasDocumentDataMapper.java
@@ -16,6 +16,7 @@ import com.knecon.fforesight.service.layoutparser.internal.api.data.taas.TableDa
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.Boundary;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Document;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Page;
+import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Section;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.SemanticNode;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.Table;
 import com.knecon.fforesight.service.layoutparser.processor.model.graph.nodes.TableCell;
@@ -29,10 +30,7 @@ public class TaasDocumentDataMapper {
         List<StructureObject> structureObjects = document.streamAllSubNodes()
                 .filter(node -> !node.getType().equals(NodeType.TABLE_CELL))
                 .filter(node -> !node.getType().equals(NodeType.SUPER_SECTION))
-                .filter(node -> !node.getType().equals(NodeType.HEADER))
-                .filter(node -> !node.getType().equals(NodeType.FOOTER))
-                .filter(node -> !node.getType().equals(NodeType.HEADLINE))
-                .filter(node -> !node.getType().equals(NodeType.PARAGRAPH))
+                .filter(node -> !(node.getType().equals(NodeType.SECTION) && ((Section) node).hasTables()))
                 .map(node -> {
                     if (node.getType().equals(NodeType.TABLE)) {
                         return TaasDocumentDataMapper.fromTableWithTableData((Table) node, structureObjectNumber.getAndIncrement());