Tax Type Fixes
Merge pull request #339 from sandal-smuggler/Tax-Type-Fixes

Tax Type Fixes