filter.js: overload Filter.._update_upstream_query() to prevent propagating queries upstream; add ToDo for AND query