rm the Location Type and merged it into the Location control (now called...

... water feature)