Optional for a long list of rivers

Change-Id: I9f38a9eda5258cad75a88bf26e129d2e8bd82e8d