query on selection
Merge branch 'master' into 1.7.4
fixed #82