Updates to harvester to handle weird quoting issues