Fix payment-related lists (Closes #1291, #1295, 1314)