Simpler tax rate check which Closes #3813

Could do with some more testing @ChromeOrange, and applying to .15 if
ok @coen