more fixes on feeds