find waters with lists UI
merged with master updates
Added the missing files from last merge
merged find_waters med search