Tweak waterway=wadi