Fixed query action/executor; simple tests work