Get rid of name filter and use ids