Bug 957221 - Query local mirror, then remote mirror

* Update based on V2 work