make config more query friendly