Editor logic moved to separate query plugin