Ensure that NdOverlay is propagated correctly in dynamic batched mode

holoviews/plotting/bokeh/element.py

@@ -852,11 +852,18 @@ def update_frame(self, key, ranges=None, element=None, empty=False):
         ranges = self.compute_ranges(range_obj, key, ranges)
         for k, subplot in self.subplots.items():
             empty, el = False, None
+            # If in Dynamic mode propagate elements to subplots
             if isinstance(self.hmap, DynamicMap) and element:
-                idx = dynamic_update(self, subplot, k, element, items)
-                empty = idx is None
-                if not empty:
-                    _, el = items.pop(idx)
+                # In batched mode NdOverlay is passed to subplot directly
+                if self.batched:
+                    el = element
+                    empty = False
+                # If not batched get the Element matching the subplot
+                else:
+                    idx = dynamic_update(self, subplot, k, element, items)
+                    empty = idx is None
+                    if not empty:
+                        _, el = items.pop(idx)
             subplot.update_frame(key, ranges, element=el, empty=(empty or all_empty))
 
         if isinstance(self.hmap, DynamicMap) and items:

holoviews/plotting/plot.py

@@ -547,9 +547,8 @@ def get_zorder(self, overlay, key, el):
         spec = util.get_overlay_spec(overlay, key, el)
         try:
             return self.ordering.index(spec)
-        except IndexError:
-            if spec not in self.ordering:
-                self.ordering = util.layer_sort(self.hmap)
+        except ValueError:
+            self.ordering = sorted(self.ordering+[spec])
             return self.ordering.index(spec)