Added query settings feature