Favorites with rail bug fix