Fixes and changes on the datafeeds component