analyze objects in datastore - minor changes