Don't nest query in data
Merge branch 'master' into gh-pages