These are the changes I made

I made the following changes to my local copy of the ListViewer Im not sure if they are accurate but the things I was trying to do started working as expected.
This change looks good to me.