more clever filter by name