Xojo2025R2.1: WebListBox with Data Source appears to have SelectedRowIndex problem

I have the WebListBox in WebContainer, using Thread and Data Source. Upon clicking on the row in the list the details load allowing user to make changes and save.
The problem is that upon saving the list is rebuild but the original row is no longer selected. I have tried to reselect this row using WebTimer, it appears that it works in the dev mode but after deploying to test web server it is not showing the row selected.

Related to this (maybe a separate issue, maybe not) the first click on the row upon rebuilding the list will do nothing, only second and every other subsequent click will select row and load details. The list allows only single selection. The attempt to consult ChatGPT gives me this:

“Ah — now this is a classic WebListBox + WebDataSource timing issue in Xojo Web apps.  This usually occurs because:
SelectedRowIndex / row selection state is “stale” right after a rebuild.
The browser hasn’t fully synchronized the newly loaded rows from the server to the client.
Xojo fires the Pressed event on the server for a row that was visible in the previous page or not yet fully rendered, so your handler sees SelectedRowIndex as -1 or incorrect.
Essentially, the first click “primes” the selection, and only the second click actually triggers the correct SelectedRowIndex.

I suspect, but I am not sure, that the issue may have something to do with the WebContainer as I don’t observe the same issue when WebListBox is placed directly on WebPage.

Has anyone observed this or have any suggestions?