diff --git a/media/js/newsblur/assetmodel.js b/media/js/newsblur/assetmodel.js
index 1a6cacd9d..0cd67ca4b 100644
--- a/media/js/newsblur/assetmodel.js
+++ b/media/js/newsblur/assetmodel.js
@@ -112,7 +112,7 @@ NEWSBLUR.AssetModel.Reader.prototype = {
         
         var story = this.get_story(story_id);
         read = story.read_status;
-        story.read_status = true;
+        story.read_status = 1;
 
         if (!read && NEWSBLUR.Globals.is_authenticated) {
             if (!(feed_id in this.queued_read_stories)) { this.queued_read_stories[feed_id] = []; }
@@ -141,7 +141,7 @@ NEWSBLUR.AssetModel.Reader.prototype = {
         
         for (s in this.stories) {
             if (this.stories[s].id == story_id) {
-                this.stories[s].read_status = false;
+                this.stories[s].read_status = 0;
                 break;
             }
         }
@@ -260,7 +260,9 @@ NEWSBLUR.AssetModel.Reader.prototype = {
                 for (var s in data.stories) {
                     this.story_keys[data.stories[s].id] = true;
                 }
-                this.feeds[feed_id].feed_address = data.feed_address || this.feeds[feed_id].feed_address;
+                if (data.feed_address) {
+                  this.feeds[feed_id].feed_address = data.feed_address;
+                }
             } else if (data) {
                 data.stories = _.select(data.stories, function(story) {
                     if (!self.story_keys[story.id]) {
diff --git a/media/js/newsblur/reader.js b/media/js/newsblur/reader.js
index b51fe62c1..23296ab64 100644
--- a/media/js/newsblur/reader.js
+++ b/media/js/newsblur/reader.js
@@ -766,6 +766,9 @@
                 $('.NB-callout-ftux .NB-callout-text').text('Loading feeds...');
                 this.$s.$feed_link_loader.css({'display': 'block'});
                 this.model.load_feeds($.rescope(this.make_feeds, this));
+                if (this.flags['showing_feed_in_tryfeed_view']) {
+                    this.hide_tryfeed_view();
+                }
             }
         },
         
@@ -797,7 +800,7 @@
             
             if (NEWSBLUR.Globals.is_authenticated && this.flags['has_chosen_feeds']) {
                 _.delay(_.bind(this.start_count_unreads_after_import, this), 1000);
-                this.force_feeds_refresh($.rescope(this.finish_count_unreads_after_import, this));
+                this.force_feeds_refresh($.rescope(this.finish_count_unreads_after_import, this), true);
             } else if (!this.flags['has_chosen_feeds'] && folders.length) {
                 _.defer(_.bind(this.open_feedchooser_modal, this), 100);
                 return;
@@ -2520,6 +2523,8 @@
                 } else if (score < 0) {
                     $story.addClass('NB-story-negative');
                 }
+                // NEWSBLUR.log(['story', story, story.read_status, $story]);
+                // $story.toggleClass('read', !story.read_status);
                 $('.NB-feed-story-tags', $story).replaceWith(this.make_story_feed_tags(story));
                 $('.NB-feed-story-author', $story).replaceWith(this.make_story_feed_author(story));
                 $('.NB-feed-story-title', $story).replaceWith(this.make_story_feed_title(story));
@@ -4377,10 +4382,11 @@
                 var feed = this.model.get_feed(feed_id);
                 if (!feed) continue;
                 var $feed = this.make_feed_title_line(feed, true, 'feed');
-                var $feed_on_page = this.find_feed_in_feed_list(feed_id);
+                var $feed_on_page = this.cache.$feed_in_feed_list[feed_id] ||
+                                    this.find_feed_in_feed_list(feed_id);
                 
                 if (feed_id == this.active_feed) {
-                    NEWSBLUR.log(['UPDATING INLINE', feed.feed_title, $feed, $feed_on_page]);
+                    NEWSBLUR.log(['UPDATING INLINE', feed.feed_title, $feed, $feed_on_page, replace_active_feed]);
                     if (!replace_active_feed) {
                         // var limit = $('.story', this.$s.$story_titles).length;
                         // this.model.refresh_feed(feed_id, $.rescope(this.post_refresh_active_feed, this), limit);
@@ -4390,8 +4396,10 @@
                         this.model.feeds[feed_id].nt = parseInt($('.unread_count_neutral', $feed_on_page).text(), 10);
                         this.model.feeds[feed_id].ng = parseInt($('.unread_count_negative', $feed_on_page).text(), 10);
                     } else {
+                        if ($feed_on_page.hasClass('NB-toplevel')) $feed.addClass('NB-toplevel');
                         $feed_on_page.replaceWith($feed);
                         this.mark_feed_as_selected(this.active_feed, $feed);
+                        this.recalculate_story_scores(feed_id);
                     }
                 } else {
                     if (!this.flags['has_unfetched_feeds']) {