Refactor queue into favourites