Updated storage code to fix race condition when re-rendering list