I don't know if anything can be done about the software right now, but longterm improvements to the queuing system would be very much appreciated. This issue will go away with time but next expansion it will no doubt return