diff --git a/plugin/Field/OutputFields.php b/plugin/Field/OutputFields.php
index b5f666c7b..64713925c 100644
--- a/plugin/Field/OutputFields.php
+++ b/plugin/Field/OutputFields.php
@@ -76,8 +76,9 @@ public function getVisibleFilterableFields(
 
 		$allFields = array_merge($fieldsArray, array_keys($geoFields));
 		$valuesDefault = array_map(function($field) use ($geoFields, $pInputVariableReader) {
-			$value = $pInputVariableReader->getFieldValueFormatted($field);
-			return $value === false ? false : $value;
+			$fieldValue = $pInputVariableReader->getFieldValueFormatted($field);
+			$geoFieldValue = $geoFields[$field] ?? null;
+			return $fieldValue === false ? false : ($fieldValue !== null ? true : ($geoFieldValue !== null ? true : null));
 		}, $allFields);
 
 		$resultDefault = array_combine($allFields, $valuesDefault);