Improve existing favs detection