[BUGFIX] Queries with NULL don't work anymore