One other thing about Octane rating on different brands. I'm not sure what's available in Alberta, but I ONLY run Chevron 94 here in BC. Why? because it's only .05/litre more than the 91 and it's ETHANOL FREE.
Shell 91 is also ETHANOL FREE but they don't use dedicated pump and because its BMW and Ferrari Kool-Aid, they charge more than Chevron 94. Car wont notice difference, but its principle.
Not sure whats available in Alberta, but I would at least fill with ETHANOL FREE for storage.