Favorites handling

fixes #652 among other things