refactored autojoin favourites option