improved Dexterity support: fixed converting DX query
improved Dexterity support: fixed DX query in widget