Queries modification
Merge origin/master