Some tweaks for better responsiveness of the new payment filters. #1709