Fix issue with space in payment method name and cashups