fixed config for new query lib
fixed query creation