fix filtering null value