tax report improvements, #23449, #25935