KCINFR-979: fixing opportunity selection