bug fix the favorites
Fix merge conflicts
Merge branch 'bug_fix_favs' into development