give waterways an address but remove them from being part of an address