Customer reported bug fix and api changes

Includes adding location fields to the CSV export.