Improve first fav creation