Separate commands and queries for tax categories. #62