fix waterbody regex