Query/Location retrieval as per old DB plan