diff --git a/pype/hosts/resolve/plugin.py b/pype/hosts/resolve/plugin.py
index e5ba39c535..111fd8f4e2 100644
--- a/pype/hosts/resolve/plugin.py
+++ b/pype/hosts/resolve/plugin.py
@@ -255,7 +255,7 @@ class CreatorWidget(QtWidgets.QDialog):
             elif v["type"] == "QSpinBox":
                 data[k]["value"] = self.create_row(
                     content_layout, "QSpinBox", v["label"],
-                    setRange=(1, 99999),
+                    setRange=(0, 99999),
                     setValue=v["value"],
                     setToolTip=tool_tip)
         return data
@@ -621,9 +621,7 @@ class PublishClip:
         self.tag_data.update(tag_hierarchy_data)
 
         if master_layer and self.review_layer:
-            self.tag_data.update({"review": self.review_layer})
-        else:
-            self.tag_data.update({"review": False})
+            self.tag_data.update({"reviewTrack": self.review_layer})
 
     def _solve_tag_hierarchy_data(self, hierarchy_formating_data):
         """ Solve tag data from hierarchy data and templates. """
diff --git a/pype/plugins/global/publish/collect_otio_review.py b/pype/plugins/global/publish/collect_otio_review.py
index c197e0066d..77698d7223 100644
--- a/pype/plugins/global/publish/collect_otio_review.py
+++ b/pype/plugins/global/publish/collect_otio_review.py
@@ -17,7 +17,7 @@ from pprint import pformat
 class CollectOcioReview(pyblish.api.InstancePlugin):
     """Get matching otio track from defined review layer"""
 
-    label = "Collect OTIO review"
+    label = "Collect OTIO Review"
     order = pyblish.api.CollectorOrder - 0.57
     families = ["clip"]
     hosts = ["resolve"]
@@ -25,8 +25,7 @@ class CollectOcioReview(pyblish.api.InstancePlugin):
     def process(self, instance):
         otio_review_clips = list()
         # get basic variables
-        review_track_name = instance.data["review"]
-        master_layer = instance.data["masterLayer"]
+        review_track_name = instance.data.get("reviewTrack")
         otio_timeline = instance.context.data["otioTimeline"]
         otio_clip = instance.data["otioClip"]
 
@@ -37,8 +36,7 @@ class CollectOcioReview(pyblish.api.InstancePlugin):
         clip_end_frame = int(
             otio_tl_range.start_time.value + otio_tl_range.duration.value)
 
-        # skip if master layer is False
-        if not master_layer:
+        if not review_track_name:
             return
 
         for track in otio_timeline.tracks:
@@ -82,9 +80,12 @@ class CollectOcioReview(pyblish.api.InstancePlugin):
             if otio_gap:
                 otio_review_clips.append(otio_gap)
 
-        instance.data["otioReviewClips"] = otio_review_clips
+        if otio_review_clips:
+            instance.data["families"] += ["review", "ftrack"]
+            instance.data["otioReviewClips"] = otio_review_clips
         self.log.debug(
             "_ otio_review_clips: {}".format(otio_review_clips))
-
         self.log.debug(
             "_ instance.data: {}".format(pformat(instance.data)))
+        self.log.debug(
+            "_ families: {}".format(instance.data["families"]))
diff --git a/pype/plugins/global/publish/collect_otio_subset_resources.py b/pype/plugins/global/publish/collect_otio_subset_resources.py
index 1642c3371d..f6bfe11941 100644
--- a/pype/plugins/global/publish/collect_otio_subset_resources.py
+++ b/pype/plugins/global/publish/collect_otio_subset_resources.py
@@ -18,7 +18,7 @@ import pype
 class CollectOcioSubsetResources(pyblish.api.InstancePlugin):
     """Get Resources for a subset version"""
 
-    label = "Collect OTIO subset resources"
+    label = "Collect OTIO Subset Resources"
     order = pyblish.api.CollectorOrder - 0.57
     families = ["clip"]
     hosts = ["resolve"]
diff --git a/pype/plugins/resolve/publish/collect_instances.py b/pype/plugins/resolve/publish/collect_instances.py
index 4693b94e4b..c64d069909 100644
--- a/pype/plugins/resolve/publish/collect_instances.py
+++ b/pype/plugins/resolve/publish/collect_instances.py
@@ -48,17 +48,12 @@ class CollectInstances(pyblish.api.ContextPlugin):
 
             asset = tag_data["asset"]
             subset = tag_data["subset"]
-            review = tag_data["review"]
 
             # insert family into families
             family = tag_data["family"]
             families = [str(f) for f in tag_data["families"]]
             families.insert(0, str(family))
 
-            # apply only for feview and master track instance
-            if review:
-                families += ["review", "ftrack"]
-
             data.update({
                 "name": "{} {} {}".format(asset, subset, families),
                 "asset": asset,