Fixed indexed fields in DatastoreMapper