GH-3621: Replace the previous field in the queue instead of appending to the queue

GH-3621: Replace the previous field in the queue instead of appending to the queue #2990