Revert "refactoring QueryBuilder"
Revert "refactoring QueryBuilder"

This reverts commit b217d549b338467b471d81bd20e1e3b2b7fea8e3.
Piou-piou/ribs-framework,Piou-piou/ribs-framework,Piou-piou/ribs-framework