Implement basic query configuration.
Merge branch 'basic-queries'