Added query config feature
Applied new params