improve server-queue