removed DataFormatString from the all markup files