Fixed all fields being named date1 bug