#287 Fixed the river name issue (work in progress)