rework payment field handling and fix markup field rendering