Made more changes
Sort by favourites now works