[grid.walker.wrapper] use correct type
[grid.walker] moved ApplyOn to separate header