optimize tfidf query
Merge branch 'cm_pseudo_queries'
Merge branch 'master' into RELEASE_20140325