[SCM] More changes in top_people query. I hope final ones.