diff --git a/QMLComponents/analysisform.cpp b/QMLComponents/analysisform.cpp
index 2dcaaa6a32..0da3d80e38 100644
--- a/QMLComponents/analysisform.cpp
+++ b/QMLComponents/analysisform.cpp
@@ -205,8 +205,8 @@ void AnalysisForm::addColumnControl(JASPControl* control, bool isComputed)
 {
 	if (isComputed)
 	{
-		connect(control, &JASPControl::requestComputedColumnCreation,		_analysis, &AnalysisBase::requestComputedColumnCreationHandler,			Qt::QueuedConnection);
-		connect(control, &JASPControl::requestComputedColumnDestruction,	_analysis, &AnalysisBase::requestComputedColumnDestructionHandler,		Qt::QueuedConnection);
+		connect(control, &JASPControl::requestComputedColumnCreation,		_analysis, &AnalysisBase::requestComputedColumnCreationHandler);
+		connect(control, &JASPControl::requestComputedColumnDestruction,	_analysis, &AnalysisBase::requestComputedColumnDestructionHandler);
 	}
 	else
 		connect(control, &JASPControl::requestColumnCreation, _analysis, &AnalysisBase::requestColumnCreationHandler);
diff --git a/QMLComponents/models/listmodelfiltereddataentry.cpp b/QMLComponents/models/listmodelfiltereddataentry.cpp
index 12310dfde9..efae7915ee 100644
--- a/QMLComponents/models/listmodelfiltereddataentry.cpp
+++ b/QMLComponents/models/listmodelfiltereddataentry.cpp
@@ -69,7 +69,7 @@ void ListModelFilteredDataEntry::runFilter()
 
 void ListModelFilteredDataEntry::filterDoneHandler(const QString &name, const QString & error)
 {
-	if(name.toStdString() != _filterName)
+	if(name.toStdString() != _filter->name())
 		return;
 
 	Log::log() << "ListModelFilteredDataEntry::filterDoneHandler for " << name << " and error '" << error << "'" << std::endl;
@@ -224,7 +224,7 @@ void ListModelFilteredDataEntry::fillTable()
 	_tableTerms.rowNames.clear();
 	_tableTerms.values.clear();
 	
-	if (_filter)
+	if(_filter)
 		_filter->checkForUpdates();
 	
 	size_t dataRows = _filter && _filter->filtered().size() > 0 ? _filter->filtered().size() : getDataSetRowCount();