Updates to queryWidget and queryEngine