refactore : use function getQuery
Add new function getQuery and refactore to use
Merge branch 'master' of github.com:WebTales/rubedo