Favorites fixes
Merge pull request #3 from bmneely/favorites

Favorites fixes