Filter fix for null