Unify name filtering and type filtering to use row.Visable.