Fix #1102 and #1098: fix AR/AP tax included and overwritten notes.