unrolling back the earlier change - converting "OR IS NOT NULL" to "OR IS NULL". Because the earlier comparison will fail only if .id is null