CLSN-897: query executer fixed