Improved favs management