better currency pair handling