RxJS: fixed selectSwitch/flatMapLatest