SWC-1594: improve query table editor