Fix filter to use null