Experimenting with wierd "remove" not working behaviour

Author: PicoCreator

src/main/java/picoded/dstack/mongodb/MongoDB_DataObjectMap.java

@@ -268,13 +268,20 @@ public void DataObjectRemoteDataMap_update(String _oid, Map<String, Object> full
 			if (updateKeys.contains(key)) {
 				// Handle NULL values unset
 				if (value == null || value == ObjectToken.NULL) {
-					unset_doc.append(key, 1);
+					unset_doc.append(key, "");
 					continue;
 				}
 
 				// Handle values update
 				set_doc.append(key, value);
 				continue;
+			} else {
+				// It seems like for some reason NULL might not be properly triggering the updateKeys?
+				if (value == null || value == ObjectToken.NULL) {
+					unset_doc.append(key, "");
+					set_doc.append(key, null);
+					setOnInsert_doc.append(key, null);
+				}
 			}
 
 			// OK - this is not in the update dataset