A few more optimisations for GridView

2 jobs for master in 17 seconds