SWC-807: fix query table service pagination and editing existing widget