Fixed issue where empty strings were counted as not null