Improved pull to switch queue behavior