added favorites, fxed subscription