Tidied up query fetcher config