Added dimension format to data-nav; Fixed date type keyword not being set