minor changes to the extension to make it work better with ndb datastore