rework Liz's code to filter water params

[jeanetteclark]

I used some more complicated dplyr methods here to filter if any of the flag columns matched the codes, as opposed to splitting out into separate data frames