Refactoring and fixes on feeds model/controller