OK, For some reason water coming out of the Storage tank are counted as Mains water no mater what their true source was. Attached is simulation output showing that: