improvements to queue refreshing