Only show remove fee URL if it is an item fee. #1956
Reorganize payment receipt. #1956
ensure type is set for backwards compatibility. #1956