Additional queue optimization (bug #3093, with mods)