refactor: query
Merge branch 'master' into developer