Work on QueryEntity

PP'd with addshore

Change-Id: I838a2ce49d053b854f2e228b07cf14ddb2b29044