diff --git a/src/drc/drc/built-in-macros/_drc_engine.rb b/src/drc/drc/built-in-macros/_drc_engine.rb
index faa119dac..fa5cf402c 100644
--- a/src/drc/drc/built-in-macros/_drc_engine.rb
+++ b/src/drc/drc/built-in-macros/_drc_engine.rb
@@ -3450,7 +3450,13 @@ CODE
           view = RBA::LayoutView::current
           view || raise("No view open")
           if $1 == "+"
+            prev_cv = view.active_cellview_index
             n = view.create_layout(true)
+            if prev_cv >= 0
+              # make the original cellview the active one again - this way
+              # we can re-run DRC without using the new output.
+              view.active_cellview_index = prev_cv
+            end
             cellname ||= (@def_cell ? @def_cell.name : "TOP")
           else
             n = $1.to_i - 1
diff --git a/src/lay/lay/layMacroEditorPage.cc b/src/lay/lay/layMacroEditorPage.cc
index b0818e6f4..5b601b6e9 100644
--- a/src/lay/lay/layMacroEditorPage.cc
+++ b/src/lay/lay/layMacroEditorPage.cc
@@ -753,7 +753,7 @@ void MacroEditorPage::fill_completer_list ()
   QString ssel = c.selectedText ();
   QString s = ssel.mid (0, pos - pos0);
 
-  if (! s[0].isLetter () && s[0].toLatin1 () != '_') {
+  if (s.length () == 0 || (! s[0].isLetter () && s[0].toLatin1 () != '_')) {
     return;  // not a word
   }
 
diff --git a/src/laybasic/laybasic/gsiDeclLayLayoutViewBase.cc b/src/laybasic/laybasic/gsiDeclLayLayoutViewBase.cc
index 86bf942d7..c6149950e 100644
--- a/src/laybasic/laybasic/gsiDeclLayLayoutViewBase.cc
+++ b/src/laybasic/laybasic/gsiDeclLayLayoutViewBase.cc
@@ -868,7 +868,7 @@ LAYBASIC_PUBLIC Class<lay::LayoutViewBase> decl_LayoutViewBase ("lay", "LayoutVi
   gsi::method ("active_cellview", static_cast<lay::CellViewRef (lay::LayoutViewBase::*) ()> (&lay::LayoutViewBase::active_cellview_ref),
     "@brief Gets the active cellview (shown in hierarchy browser)\n"
     "\n"
-    "This is a convenience method which is equivalent to cellview(active_cellview_index()).\n"
+    "This is a convenience method which is equivalent to \"cellview(active_cellview_index)\".\n"
     "\n"
     "This method has been introduced in version 0.19.\n"
     "Starting from version 0.25, the returned object can be manipulated which will have an immediate effect "
diff --git a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc
index a8dac54e5..893f83eb5 100644
--- a/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc
+++ b/src/plugins/streamers/lefdef/db_plugin/dbLEFDEFImporter.cc
@@ -1513,7 +1513,9 @@ std::set<unsigned int> LEFDEFReaderState::open_layer_uncached(db::Layout &layout
 
       bool found = false;
       for (db::Layout::layer_iterator i = layout.begin_layers (); i != layout.end_layers () && ! found; ++i) {
-        if ((*i).second->log_equal (lp_new)) {
+        //  NOTE: if lp_new only has a name, we also check for the name. Since we assign a default layer/datatype,
+        //  otherwise, a "reload" in the UI would not recognize the layer as the same.
+        if ((*i).second->log_equal (lp_new) || (lp_new.is_named () && (*i).second->name == lp_new.name)) {
           found = true;
           res.insert ((*i).first);
         }