non-package fees, "hold until next bill" option, #25899
fix incomplete field rename, #25899
redesign the "nextbill" flag a little, #25899