Logic improvement for roaming stations

Follow