fix for #714, add default filter to prevent None