added more strict filtering