Merge "Fix and refactor query across anchors (CPS-1664 #3)"