fix fees vs. tax refactor, RT#76366