Love it! Especially your solution for getting linear features out of "river".