fixes river routing for river names containing the river type
see https://github.com/elasticsearch/elasticsearch/issues/3843