Fixes #4940: Updating to support queryPaged and queryUnpaged across the ...

...UI.