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