Fix bugs introduced with user_feed