adding the by-queue information back into template