Arcane Surge buff is always assumed active even if the supported skill has no mana cost

Is your feature request related to a problem? Please describe.
I play a Death's Oath/Blight build. I support Death Aura with Arcane Surge to give it a duration skill tag so I can use Less Duration and Swift Affliction support gems. PoB then assumes I have the Arcane Surge active buff even though the ability has no mana cost. This then makes my Blight dps calculations too high because I don't actually have the spell damage and cast speed buff and I cannot disable it without turning the skill gem off which in turn makes my Death Aura dps calculation off by losing two support gems. Certainly an annoying problem to go back and forth depending on what skill I'm looking at.

Describe the solution you'd like
I think the simplest solution is to have a check if the Arcane Surge supported ability has a mana cost or not. If it does not, do not have the buff active.

Describe alternatives you've considered
Another solution would to be have a check box in the skill options section under the configuration tab to have the Arcane Surge buff active or not that defaults to being checked on when the skill is linked and the user can disable it to preference.

Additional context
Here's the pastebin for my build if you'd like to witness what I'm describing: https://pastebin.com/AimtXgWx

Reproduce the behavior with the linked Pastebin build, then trace Arcane Surge handling from the skill configuration options. Check how supported-skill mana cost affects the active buff while keeping the support links enabled. Done means a no-mana-cost supported skill does not grant Arcane Surge, while a skill with a mana cost still does.