diff --git a/geest/gui/dialogs/factor_aggregation_dialog.py b/geest/gui/dialogs/factor_aggregation_dialog.py
index b59ca6f..98d63c0 100644
--- a/geest/gui/dialogs/factor_aggregation_dialog.py
+++ b/geest/gui/dialogs/factor_aggregation_dialog.py
@@ -185,14 +185,15 @@ def populate_table(self):
             data_source_widget = DataSourceWidgetFactory.create_widget(
                 attributes["analysis_mode"], 1, attributes
             )
-            data_source_widget.setSizePolicy(
-                QSizePolicy.Expanding, QSizePolicy.Preferred
-            )
-
-            data_source_widget.setMinimumWidth(150)
-            data_source_widget.setMinimumHeight(30)
-            data_source_widget.setParent(self.table)  # Set the table as the parent
             if data_source_widget:
+                data_source_widget.setSizePolicy(
+                    QSizePolicy.Expanding, QSizePolicy.Preferred
+                )
+
+                data_source_widget.setMinimumWidth(150)
+                data_source_widget.setMinimumHeight(30)
+                data_source_widget.setParent(self.table)  # Set the table as the parent
+
                 self.table.setCellWidget(
                     row, 0, data_source_widget
                 )  # Set widget in leftmost column
diff --git a/geest/gui/widgets/datasource_widgets/vector_datasource_widget.py b/geest/gui/widgets/datasource_widgets/vector_datasource_widget.py
index d1522dd..5de4489 100644
--- a/geest/gui/widgets/datasource_widgets/vector_datasource_widget.py
+++ b/geest/gui/widgets/datasource_widgets/vector_datasource_widget.py
@@ -29,6 +29,8 @@ def add_internal_widgets(self) -> None:
             filter = None
             if self.attributes.get("use_point_per_cell", 0):
                 filter = QgsMapLayerProxyModel.PointLayer
+            elif self.attributes.get("use_multi_buffer_point", 0):
+                filter = QgsMapLayerProxyModel.PointLayer
             elif self.attributes.get("use_polyline_per_cell", 0):
                 filter = QgsMapLayerProxyModel.LineLayer
             else: