Add title attribute to queries

Change-Id: Idbc744ade82f0bb2b199f913049165167897e0b1