 			var queryGeomVertices:Array = geometry.getVertices();
 			var keys:Array = getKeysBoundingBoxOverlap((geometry as SimpleGeometry).bounds, filterBoundingBoxesByImportance ? minImportance : 0);
 			
-			if (_keyToGeometriesMap == null || !Weave.properties.enableGeometryProbing.value)
-				return keys;
+			var geomEnabled:Boolean = _keyToGeometriesMap && Weave.properties.enableGeometryProbing.value;
 			
 			var result:Array = [];
 			

			keyLoop: for (var i:int = keys.length; i--;)
			{
				var key:IQualifiedKey = keys[i];
				var geoms:Array = _keyToGeometriesMap[key];
				
				if (!geom || geoms.length == 0)
				{
					var keyBounds:Array = getBoundsFromKey(key);
					for (var j:int = 0; j < keyBounds.length; j++)
					{
						setTempBounds(keyBounds[j]);

						var genGeomIsPoint:Boolean = genGeom.isPoint();
						var simplifiedGeom:Vector.<Vector.<BLGNode>> = genGeom.getSimplifiedGeometry(minImportance, dataBounds);
						
						if (simplifiedGeom.length == 0 && genGeom.bounds.overlaps(queryBounds))
						{
							result.push(key);
							continue;
