_update_upstream_query() and _query_tree_update():
  switch order of parameters removes and add to reflect their actuall processing order: removes are always processed first

Filter: implement AND query from downstream into _update_upstream_query() WIP