Solving corner cases for proper play queue behavior.