Adding tooltips.
Merge branch 'query2'