UI improvements for selecting taxproducts, #71555 and #71556