Fix null values incorrectly filtered