4527 check___query bug fix
Merge remote branch 'cheby/4527'
Merge branch 'master' of git://github.com/do-/eludia