- Prevented race condition with queue update
- Prevented race condition with list scrolling