Add a 'description' field to Queries

Change-Id: I7631a3fa78c3f8a219a0ce5c6f3da866fcbe131d