Use query keyword to label query view for #118.
Merge remote-tracking branch 'template/master'