Data grid format fixes jds 6 May 2014