Remember the present / future edge choice
Change "NaN" query results to be 0.0

Ref #702
Ref quintel/etmodel#1829