Hello again,

I propose to do a partial, manual rollback of this changest to return the rapids tagging to be in line with the guidelines and practices stated above.  Namely removing the name from the natural=water + water=river area as it already exists on the waterway=river and breaking the natural=water + water=river multi-polygon into more manageable chunks. 

Cheers,
scarapella
