UP-4234:  Fix favorites looping