Count method, Term search query,  IQuery fix
Merge remote-tracking branch 'origin/master'