fixing todos in EventStoreService