Multiple fixes

1. PaymentMode for XML
2. ProductRecomended CFF saving for Rider
3. ProductRecomended XML