Promote some extra filters to default. Test issue fixes.