Fix Query Action freeze