Implementation work on QueryEntityDeserializer

Change-Id: Ie85b1f0171ae7f3fe859850876e6d37edc313f3a