diff --git a/Src/nmNum/nmSubWxs/nmWxIncludeOtherWells.cpp b/Src/nmNum/nmSubWxs/nmWxIncludeOtherWells.cpp
index e805650..fa6eacc 100644
--- a/Src/nmNum/nmSubWxs/nmWxIncludeOtherWells.cpp
+++ b/Src/nmNum/nmSubWxs/nmWxIncludeOtherWells.cpp
@@ -576,8 +576,7 @@ void nmWxIncludeOtherWells::normalizeFlowSelection(WellDataRow& data) const
 {
 	const nmFlowGaugeRecord* pRecord = findFlowRecord(
 			data.m_vecFlowRecords, data.m_sFlowGaugeCode);
-	if(pRecord == nullptr ||
-	   pRecord->eStatus != NM_GaugeRecord_Usable) {
+	if(pRecord == nullptr || !nmIsSelectableFlowRecord(*pRecord)) {
 		data.m_sFlowGaugeCode.clear();
 		data.m_bUseOilRate = false;
 		data.m_bUseGasRate = false;
@@ -592,12 +591,6 @@ void nmWxIncludeOtherWells::normalizeFlowSelection(WellDataRow& data) const
 			isSelectableFlowPhase(*pRecord, PHASE_Gas);
 	data.m_bUseWaterRate = data.m_bUseWaterRate &&
 			isSelectableFlowPhase(*pRecord, PHASE_Water);
-	if(!data.m_bUseOilRate && !data.m_bUseGasRate &&
-	   !data.m_bUseWaterRate) {
-		data.m_sFlowGaugeCode.clear();
-		data.m_nFlowSegmentIndex = 0;
-		return;
-	}
 
 	const int nSegmentCount = flowRecordSegmentCount(*pRecord);
 	if(nSegmentCount <= 0) {
@@ -819,10 +812,6 @@ void nmWxIncludeOtherWells::onRateSourceChanged(int nIndex)
 	const QString sGaugeCode = pComboBox->itemData(nIndex).toString();
 	if(sGaugeCode.isEmpty()) {
 		setRowPhaseUsed(oData, ePhase, false);
-		if(!oData.m_bUseOilRate && !oData.m_bUseGasRate &&
-		   !oData.m_bUseWaterRate) {
-			switchRowFlowGaugeCode(oData, QString());
-		}
 	} else {
 		const nmFlowGaugeRecord* pRecord = findFlowRecord(
 				oData.m_vecFlowRecords, sGaugeCode);