Fixed queries expecting one but getting nothing.
Merge branch 'master' of https://github.com/r3d3y3/ComMotion