fix #77 slow query on main page
Merge branch 'master' into tags