Corrected data table field names
Merge branch 'master' into develop