Removed dups from WQ field printing

As expected, once people started using the tool, some fields were discovered to be in the wrong places. This sorts out the WQ structure (the most complex)