Fixing favorites regressions...