Implementation work on QueryEntityDeserializer

PP'd with addshore

Change-Id: Ib70beb22878d6e149370ad19bf2f4d3408fc0ae2