diff --git a/lcviz/plugins/binning/binning.py b/lcviz/plugins/binning/binning.py
index 49f796a0..5758d12b 100644
--- a/lcviz/plugins/binning/binning.py
+++ b/lcviz/plugins/binning/binning.py
@@ -144,13 +144,13 @@ def _live_update(self, event={}):
             times = lc_time
 
         for viewer_id, mark in self.marks.items():
-            viewer_ref = self.app.get_viewer_by_id(viewer_id).reference
             if self.ephemeris_selected == 'No ephemeris':
                 visible = True
-                do_phase = viewer_ref != 'flux-vs-time'
+                # TODO: fix this to be general and not rely on ugly id
+                do_phase = viewer_id != 'lcviz-0'
             else:
                 # TODO: try to fix flashing as traitlets update
-                visible = viewer_ref.split(':')[-1] == self.ephemeris_selected
+                visible = viewer_id.split(':')[-1] == self.ephemeris_selected
                 do_phase = False
 
             if visible:
diff --git a/lcviz/plugins/ephemeris/ephemeris.py b/lcviz/plugins/ephemeris/ephemeris.py
index 1ab10d49..65a768cc 100644
--- a/lcviz/plugins/ephemeris/ephemeris.py
+++ b/lcviz/plugins/ephemeris/ephemeris.py
@@ -320,7 +320,8 @@ def _on_component_rename(self, old_lbl, new_lbl):
         if self._phase_viewer_id(old_lbl) in self.app.get_viewer_reference_names():
             self.app._update_viewer_reference_name(
                 self._phase_viewer_id(old_lbl),
-                self._phase_viewer_id(new_lbl)
+                self._phase_viewer_id(new_lbl),
+                update_id=True
             )
 
         # update metadata entries so that they can be used for filtering applicable entries in