SWC-807: fix query table service pagination and editing existing widget
from code review
Merge pull request #542 from jay-hodgson/SWC-807

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