Fixes to get favorite toggle working