diff --git a/pype/tools/standalonepublish/widgets/widget_asset.py b/pype/tools/standalonepublish/widgets/widget_asset.py
index df26eff2b1..4680e88344 100644
--- a/pype/tools/standalonepublish/widgets/widget_asset.py
+++ b/pype/tools/standalonepublish/widgets/widget_asset.py
@@ -284,6 +284,7 @@ class AssetWidget(QtWidgets.QWidget):
         self.task_changed.emit()
 
     def _refresh_tasks(self):
+        self.dbcon.Session["AVALON_TASK"] = None
         tasks = []
         selected = self.get_selected_assets()
         if len(selected) == 1:
diff --git a/pype/tools/standalonepublish/widgets/widget_family.py b/pype/tools/standalonepublish/widgets/widget_family.py
index c3b95b8fc8..5521503508 100644
--- a/pype/tools/standalonepublish/widgets/widget_family.py
+++ b/pype/tools/standalonepublish/widgets/widget_family.py
@@ -305,30 +305,46 @@ class FamilyWidget(QtWidgets.QWidget):
         subset_name = self.input_result.text()
         version = 1
 
+        asset_doc = None
+        subset_doc = None
+        versions = None
         if (
             asset_name != self.NOT_SELECTED and
             subset_name.strip() != ''
         ):
-            asset = self.dbcon.find_one({
-                'type': 'asset',
-                'name': asset_name
-            })
-            subset = self.dbcon.find_one({
-                'type': 'subset',
-                'parent': asset['_id'],
-                'name': subset_name
-            })
-            if subset:
-                versions = self.dbcon.find({
+            asset_doc = self.dbcon.find_one(
+                {
+                    'type': 'asset',
+                    'name': asset_name
+                },
+                {"_id": 1}
+            )
+
+        if asset_doc:
+            subset_doc = self.dbcon.find_one(
+                {
+                    'type': 'subset',
+                    'parent': asset_doc['_id'],
+                    'name': subset_name
+                },
+                {"_id": 1}
+            )
+
+        if subset_doc:
+            versions = self.dbcon.find(
+                {
                     'type': 'version',
-                    'parent': subset['_id']
-                })
-                if versions:
-                    versions = sorted(
-                        [v for v in versions],
-                        key=lambda ver: ver['name']
-                    )
-                    version = int(versions[-1]['name']) + 1
+                    'parent': subset_doc['_id']
+                },
+                {"name": 1}
+            ).distinct("name")
+
+        if versions:
+            versions = sorted(
+                [v for v in versions],
+                key=lambda ver: ver['name']
+            )
+            version = int(versions[-1]['name']) + 1
 
         self.version_spinbox.setValue(version)