diff --git a/jellyfin_kodi/objects/kodi/queries.py b/jellyfin_kodi/objects/kodi/queries.py
index 1be45489..1216c17b 100644
--- a/jellyfin_kodi/objects/kodi/queries.py
+++ b/jellyfin_kodi/objects/kodi/queries.py
@@ -358,8 +358,8 @@ WHERE       idPath = ?
 """
 update_path_movie_obj = ["{Path}", "movies", "metadata.local", 1, "{PathId}"]
 update_path_toptvshow_obj = ["{TopLevel}", "tvshows", "metadata.local", 1, "{TopPathId}"]
-update_path_tvshow_obj = ["{Path}", "tvshows", "metadata.local", 1, "{PathId}"]
-update_path_episode_obj = ["{Path}", "tvshows", "metadata.local", 1, "{PathId}"]
+update_path_tvshow_obj = ["{Path}", None, None, 1, "{PathId}"]
+update_path_episode_obj = ["{Path}", None, None, 1, "{PathId}"]
 update_path_mvideo_obj = ["{Path}", "musicvideos", "metadata.local", 1, "{PathId}"]
 
 update_file = """
diff --git a/jellyfin_kodi/objects/tvshows.py b/jellyfin_kodi/objects/tvshows.py
index fbcbc295..29706469 100644
--- a/jellyfin_kodi/objects/tvshows.py
+++ b/jellyfin_kodi/objects/tvshows.py
@@ -177,7 +177,8 @@ class TVShows(KodiDb):
         self.jellyfin_db.add_reference(*values(obj, QUEM.add_reference_tvshow_obj))
         LOG.debug("ADD tvshow [%s/%s/%s] %s: %s", obj['TopPathId'], obj['PathId'], obj['ShowId'], obj['Title'], obj['Id'])
 
-        self.update_path_parent_id(obj['PathId'], obj['TopPathId'])
+        if self.direct_path:
+            self.update_path_parent_id(obj['PathId'], obj['TopPathId'])
 
     def tvshow_update(self, obj):
 
@@ -195,7 +196,8 @@ class TVShows(KodiDb):
         self.jellyfin_db.update_reference(*values(obj, QUEM.update_reference_obj))
         LOG.debug("UPDATE tvshow [%s/%s] %s: %s", obj['PathId'], obj['ShowId'], obj['Title'], obj['Id'])
 
-        self.update_path_parent_id(obj['PathId'], obj['TopPathId'])
+        if self.direct_path:
+            self.update_path_parent_id(obj['PathId'], obj['TopPathId'])
 
     def get_path_filename(self, obj):
 
@@ -206,6 +208,9 @@ class TVShows(KodiDb):
             if '\\' in obj['Path']:
                 obj['Path'] = "%s\\" % obj['Path']
                 obj['TopLevel'] = "%s\\" % dirname(dirname(obj['Path']))
+            elif 'smb://' in obj['Path'] or 'nfs://' in obj['Path']:
+                obj['Path'] = "%s/" % obj['Path']
+                obj['TopLevel'] = "%s/" % dirname(dirname(obj['Path']))
             else:
                 obj['Path'] = "%s/" % obj['Path']
                 obj['TopLevel'] = "plugin://plugin.video.jellyfin/"
@@ -387,9 +392,10 @@ class TVShows(KodiDb):
 
         self.jellyfin_db.add_reference(*values(obj, QUEM.add_reference_episode_obj))
 
-        parentPathId = self.jellyfin_db.get_episode_kodi_parent_path_id(*values(obj, QUEM.get_episode_kodi_parent_path_id_obj))
-        LOG.debug("Setting episode pathParentId, episode %s, title %s, pathId %s, pathParentId %s", obj['Id'], obj['Title'], obj['PathId'], parentPathId)
-        self.update_path_parent_id(obj['PathId'], parentPathId)
+        if self.direct_path:
+            parentPathId = self.jellyfin_db.get_episode_kodi_parent_path_id(*values(obj, QUEM.get_episode_kodi_parent_path_id_obj))
+            LOG.debug("Setting episode pathParentId, episode %s, title %s, pathId %s, pathParentId %s", obj['Id'], obj['Title'], obj['PathId'], parentPathId)
+            self.update_path_parent_id(obj['PathId'], parentPathId)
 
         LOG.debug("ADD episode [%s/%s] %s: %s", obj['PathId'], obj['FileId'], obj['Id'], obj['Title'])