Fix regressions in grid layer. Still breaking due to locked-in-jsonp format