corrected filters to deal with null values