Favorites support bugfix