Modified filter by name structure