Fixed query order.
Merge branch 'master' of https://github.com/cdusold/3114
Unfixed query order.