KCINFR-979: fixing opportunity selection
Merge pull request #464 from leoherbie/s2s_fix

KCINFR-979: fixing opportunity selection