Fix bug where there are naming conflicts between subfields and columns
Fix bug where there are naming conflicts between subfields and columns

This changes the query to be very explicit about the fields that we are
working on

jacksontj/dataman