EventStoreLayer: Some fixes and List can be now also null