Lot of fixes for different kind of feeds