blank location_type in api for location nulls out location_type
Merge branch 'enhancements'