Fixed a couple of bugs in gates grid dates rendering