Update the JMeter script to remove the tags like 'Lake:All', since that ...

...is not really what they mean.  Instead, those are now tagged with all the individual lakes (or channels or watersheds).  I also added a scheme for LocationType so and ensured that all records were tagged with the type.  That allows you to search for something is of type Lake, even if you don't care which lake.

I also update the text in the UI to be more explicit about the 'Any Lake' type options.