added much more strict filtering