FeedController fixes