Added some fixes to Favourite.