case 2883 - Adding missing headers, removing spaces and changing js load.
case 2883 - Adding missing headers to table.
Merge remote-tracking branch 'origin/case-2883' into develop