Fixing double listing of cash payment type and show taxable amounts in totals properly.