#5241

#5168

#5234

#5233

#5193

#5169

#5152

#5214

Render fishpass and tidy waterway bridge/tunnel code

Merge segmented ways to improve labels and shields