Rework UTFGrid support