Refactors building full Queue name + marks