UP-4234:  Fix favorites looping
Merge pull request #1 from drewwills/UP-4234v2

UP-4234:  Fix favorites looping