I think Sawblade Upgrades shouldn't be used in any other machine then Sawblade

yes that is correct but the way the upgrade system works that is IIRC unfixable.
Basically i can only declare a "class" of Upgrade not a machine specific upgrade in the filters.