Fixed problems with the persistence of the queue across pages
Fixed merge confict