CE-450 and VID-2089 fixing table sorting when loaded on demand