Fix for issue #951 where errors on remove and insert in refreshed lists

For sure require review and testing, but it fixes bbUI for my application.