Fix query initializer
Add configuration