PopupStreamSelect fixes