Tax class settings fixes Closes #2167.