fixed bug with datastore upload
Fixes to make both the rest and importers work again.