Changed q range to use new field format
Added automatic labelling to fields