Set default query count to 50
Merge branch 'master' into gh-pages