Minor fixes

Remove NAs on filtered fields.