restrict :river terms to own rivers
:visibility needs no quotes, but :river does
argument of :from term must be wrapped in quotes
parsed query for :river contains river object, not id
parsed :pool term contains pool object, not just id