Fixed up the joined data columns to make more efficient queries