Minor changes to default filter per Ian's suggestions