diff --git a/src/app/components/generic-calculator/calculator.component.ts b/src/app/components/generic-calculator/calculator.component.ts
index 6c2119744534d4e97d5b5515137daab44e50fe3d..c5fa863676438faf4f4cb5013e1040ac6908c02a 100644
--- a/src/app/components/generic-calculator/calculator.component.ts
+++ b/src/app/components/generic-calculator/calculator.component.ts
@@ -125,9 +125,6 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
     /** Allows trigerring afterFirstViewChecked() just after calculator is loaded */
     private firstViewChecked = false;
 
-    /** For PreBarrage only: if true, show input data in the right panel, else show results */
-    public showPBInputData = true;
-
     public get ID() {
         if (this._formulaire) {
             return this._formulaire.uid;
@@ -136,6 +133,21 @@ export class GenericCalculatorComponent implements OnInit, DoCheck, AfterViewChe
         }
     }
 
+    /** For PreBarrage only: if true, show input data in the right panel, else show results */
+    public get showPBInputData(): boolean {
+        if (this.isPB) {
+            return (this._formulaire as FormulairePrebarrage).showInputData;
+        } else {
+            return false; // whatever, should never happen
+        }
+    }
+
+    public set showPBInputData(v: boolean) {
+        if (this.isPB) {
+            (this._formulaire as FormulairePrebarrage).showInputData = v;
+        } // else do nothing, should never happen
+    }
+
     constructor(
         @Inject(forwardRef(() => AppComponent)) private appComponent: AppComponent,
         private route: ActivatedRoute,
diff --git a/src/app/components/pb-results/pb-results-table.component.ts b/src/app/components/pb-results/pb-results-table.component.ts
index 1bab32668741394955ebd9bb918d752ab1724720..792286c8e1a8cb71bf769564a9a6c2e7feb813a5 100644
--- a/src/app/components/pb-results/pb-results-table.component.ts
+++ b/src/app/components/pb-results/pb-results-table.component.ts
@@ -1,6 +1,6 @@
 import { Component, ViewChild, ElementRef } from "@angular/core";
 
-import { PreBarrage, PbBassin } from "jalhyd";
+import { PreBarrage, PbBassin, ParamDefinition, ParamValueMode } from "jalhyd";
 
 import { I18nService } from "../../services/internationalisation.service";
 import { ResultsComponentDirective } from "../fixedvar-results/results.component";
@@ -35,6 +35,26 @@ export class PbResultsTableComponent extends ResultsComponentDirective {
         super();
     }
 
+    /**
+     * Returns value at index i for parameter p, whether it is variating
+     * or not, calculated or not
+     * @param p parameter
+     * @param i index
+     */
+    protected getIthValue(p: ParamDefinition, i: number): string {
+        let value: number;
+        if (p.hasMultipleValues) {
+            if (p.valueMode === ParamValueMode.CALCUL) {
+                value = p.parentNub.result.resultElements[i].vCalc;
+            } else {
+                value = p.getInferredValuesList()[i];
+            }
+        } else {
+            value = p.V;
+        }
+        return fv(value);
+    }
+
     public set results(r: PrebarrageResults) {
         this._pbResults = r;
 
@@ -51,6 +71,8 @@ export class PbResultsTableComponent extends ResultsComponentDirective {
             // values to build the data from
             const vi = pr.variableIndex;
 
+            // @TODO results.size ? To extend values lists…
+
             // refresh headers here if language changed
             this._headers = pr.headers;
 
@@ -59,9 +81,9 @@ export class PbResultsTableComponent extends ResultsComponentDirective {
                 this._dataSet.push([
                     this.intlService.localizeText("INFO_LIB_AMONT"),
                     "", "",
-                    fv(pb.prms.Z1.V),
+                    this.getIthValue(pb.prms.Z1, vi),
                     "", "",
-                    fv(pb.prms.Q.V)
+                    this.getIthValue(pb.prms.Q, vi),
                 ]);
             }
 
@@ -89,9 +111,9 @@ export class PbResultsTableComponent extends ResultsComponentDirective {
                 this._dataSet.push([
                     this.intlService.localizeText("INFO_LIB_AVAL"),
                     "", "",
-                    fv(pb.prms.Z2.V),
+                    this.getIthValue(pb.prms.Z2, vi),
                     "", "",
-                    fv(pb.prms.Q.V)
+                    this.getIthValue(pb.prms.Q, vi),
                 ]);
             }
         }
diff --git a/src/app/components/pb-schema/pb-schema.component.ts b/src/app/components/pb-schema/pb-schema.component.ts
index 6d2503d9990802cb147648d10d3218bd234ac11e..63e6d00f473f2fb282b72a557ef9e0fe181795bc 100644
--- a/src/app/components/pb-schema/pb-schema.component.ts
+++ b/src/app/components/pb-schema/pb-schema.component.ts
@@ -84,11 +84,15 @@ export class PbSchemaComponent implements AfterViewInit, AfterContentInit, OnIni
         });
         this.nativeElement = this.schema.nativeElement;
         this.render();
-        // reset form to river properties (clodo timeout to prevent ExpressionChangedAfterItHasBeenCheckedError)
-        setTimeout(() => {
-            this.unselect();
-        }, 10);
-        // @TODO find a way to remember last selected item ? Through a service ?
+        // restore previously selected item
+        this._selectedItem = this.pbSchema.form.selectedItem;
+        if (this._selectedItem !== undefined) {
+            // @WARNING clodo timeout to prevent ExpressionChangedAfterItHasBeenCheckedError
+            // and select schema node after schema is refreshed by ngAfterViewInit()
+            setTimeout(() => {
+                this.selectNodeOnSchema(this._selectedItem);
+            }, 20); // timeout has to be greater than the 10ms of ngAfterViewInit()
+        }
     }
 
     private render() {
@@ -497,7 +501,6 @@ export class PbSchemaComponent implements AfterViewInit, AfterContentInit, OnIni
             this.model.hasUpDownConnection()
             && ! this.model.hasBasinNotConnected()
         );
-        console.log("schéma valide", this._isValid);
         this.validChange.emit();
     }
 
diff --git a/src/app/formulaire/definition/form-prebarrage.ts b/src/app/formulaire/definition/form-prebarrage.ts
index 999a4ed57acc5b69bdf4b29aec816b906669d015..a3dcb71e81d0d65e42fee733ec02b2c0a0b06114 100644
--- a/src/app/formulaire/definition/form-prebarrage.ts
+++ b/src/app/formulaire/definition/form-prebarrage.ts
@@ -31,14 +31,17 @@ export class FormulairePrebarrage extends FormulaireFixedVar {
 
     protected _pbResults: PrebarrageResults;
 
+    /** if true, show input data in the right panel, else show results */
+    public showInputData = true;
+
     constructor() {
         super();
         this._pbResults = new PrebarrageResults();
     }
 
-    /* public get pbNub(): PreBarrage {
-        return this.currentNub as PreBarrage;
-    } */
+    public get selectedItem(): PbBassin | PbCloison {
+        return this._selectedItem;
+    }
 
     public get pbResults(): PrebarrageResults {
         return this._pbResults;