Fixed favourites so it works (though it could be way neater!)