Fix for the integration of moving the favorites to the local db

Reviewer : Tiff Go

Issue: GCP-9811, GCp-9812