Add comments to query - refs BT#8296