Feature: Fixes and Improvements to excise tax override exclusions