CLSN-1891query executer : change implementation of modal popup to button change