FIX wrong entries switching behaviour
Favorites handling