diff --git a/codeHF/config_tasks.sh b/codeHF/config_tasks.sh
index 7eae3e9c..8da6f70f 100644
--- a/codeHF/config_tasks.sh
+++ b/codeHF/config_tasks.sh
@@ -28,8 +28,8 @@ DATABASE_O2="workflows.yml"
 MAKE_GRAPH=0        # Make topology graph.
 
 # Activation of O2 workflows
-# Event selection
-DOO2_EVSEL=0        # event-selection and timestamp
+# Trigger selection
+DOO2_TRIGSEL=0        # event-selection and timestamp
 # QA
 DOO2_REJ_ALICE3=0   # qa-rejection
 DOO2_QA_EFF=0       # qa-efficiency
@@ -175,8 +175,8 @@ function MakeScriptO2 {
   [[ $DOO2_CAND_CASC -eq 1 || $DOO2_SEL_LCK0SP -eq 1 || $DOO2_TASK_LCK0SP -eq 1 ]] && DOO2_CASC=1 || DOO2_CASC=0
   # Cascade reconstruction
   [ $DOO2_CASC -eq 1 ] && SUFFIX_CASC="-v0" || SUFFIX_CASC=""
-  # Event selection
-  [ $DOO2_EVSEL -eq 1 ] && SUFFIX_EVSEL="-evsel" || SUFFIX_EVSEL=""
+  # Trigger selection
+  [ $DOO2_TRIGSEL -eq 1 ] && SUFFIX_TRIGSEL="-trigsel" || SUFFIX_TRIGSEL=""
   # ALICE 3 input
   [ "$ISALICE3" -eq 1 ] && SUFFIX_ALICE3="-alice3" || SUFFIX_ALICE3=""
 
@@ -192,7 +192,7 @@ function MakeScriptO2 {
   [ $DOO2_PID_TOF_QA -eq 1 ] && WORKFLOWS+=" o2-analysis-pid-tof-qa-mc"
   # Vertexing
   WF_SKIM="o2-analysis-hf-track-index-skims-creator"
-  [ $DOO2_SKIM -eq 1 ] && WORKFLOWS+=" ${WF_SKIM}${SUFFIX_EVSEL}${SUFFIX_CASC}"
+  [ $DOO2_SKIM -eq 1 ] && WORKFLOWS+=" ${WF_SKIM}${SUFFIX_TRIGSEL}${SUFFIX_CASC}"
   [ $DOO2_CAND_2PRONG -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-creator-2prong"
   [ $DOO2_CAND_3PRONG -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-creator-3prong"
   [ $DOO2_CAND_X -eq 1 ] && WORKFLOWS+=" o2-analysis-hf-candidate-creator-x"
@@ -241,7 +241,7 @@ function MakeScriptO2 {
 
   # Make a copy of the default workflow database file before modifying it.
   DATABASE_O2_EDIT=""
-  if [[ $DOO2_EVSEL -eq 1 || $DOO2_CASC -eq 1 || "$ISALICE3" -eq 1 ]]; then
+  if [[ $DOO2_TRIGSEL -eq 1 || $DOO2_CASC -eq 1 || "$ISALICE3" -eq 1 ]]; then
     DATABASE_O2_EDIT="${DATABASE_O2/.yml/_edit.yml}"
     cp "$DATABASE_O2" "$DATABASE_O2_EDIT" || ErrExit "Failed to cp $DATABASE_O2 $DATABASE_O2_EDIT."
     DATABASE_O2="$DATABASE_O2_EDIT"
@@ -251,9 +251,9 @@ function MakeScriptO2 {
       ReplaceString "- $WF_SEL_JPSI" "- ${WF_SEL_JPSI}${SUFFIX_ALICE3}" "$DATABASE_O2" || ErrExit "Failed to edit $DATABASE_O2."
     }
 
-    # Adjust workflow database in case of event selection or cascades enabled.
-    [[ $DOO2_EVSEL -eq 1 || $DOO2_CASC -eq 1 ]] && {
-      ReplaceString "- $WF_SKIM" "- ${WF_SKIM}${SUFFIX_EVSEL}${SUFFIX_CASC}" "$DATABASE_O2" || ErrExit "Failed to edit $DATABASE_O2."
+    # Adjust workflow database in case of trigger selection or cascades enabled.
+    [[ $DOO2_TRIGSEL -eq 1 || $DOO2_CASC -eq 1 ]] && {
+      ReplaceString "- $WF_SKIM" "- ${WF_SKIM}${SUFFIX_TRIGSEL}${SUFFIX_CASC}" "$DATABASE_O2" || ErrExit "Failed to edit $DATABASE_O2."
     }
   fi
 
diff --git a/codeHF/dpl-config_run3.json b/codeHF/dpl-config_run3.json
index df552afe..25143d9d 100644
--- a/codeHF/dpl-config_run3.json
+++ b/codeHF/dpl-config_run3.json
@@ -8,6 +8,14 @@
     },
     "hf-tag-sel-collisions": {
         "fillHistograms": "true",
+        "xVertexMin": "-100",
+        "xVertexMax": "100",
+        "yVertexMin": "-100",
+        "yVertexMax": "100",
+        "zVertexMin": "-100",
+        "zVertexMax": "100",
+        "nContribMin": "0",
+        "chi2Max": "0",
         "triggerClassName": "kINT7"
     },
     "hf-tag-sel-tracks": {
diff --git a/codeHF/dpl-config_run5_hf.json b/codeHF/dpl-config_run5_hf.json
index 6f2e0688..a6f0e069 100644
--- a/codeHF/dpl-config_run5_hf.json
+++ b/codeHF/dpl-config_run5_hf.json
@@ -8,6 +8,14 @@
     },
     "hf-tag-sel-collisions": {
         "fillHistograms": "true",
+        "xVertexMin": "-100",
+        "xVertexMax": "100",
+        "yVertexMin": "-100",
+        "yVertexMax": "100",
+        "zVertexMin": "-100",
+        "zVertexMax": "100",
+        "nContribMin": "0",
+        "chi2Max": "0",
         "triggerClassName": ""
     },
     "hf-tag-sel-tracks": {
diff --git a/codeHF/dpl-config_run5_oniaX.json b/codeHF/dpl-config_run5_oniaX.json
index 0d0d7836..f22e36dc 100644
--- a/codeHF/dpl-config_run5_oniaX.json
+++ b/codeHF/dpl-config_run5_oniaX.json
@@ -8,6 +8,14 @@
     },
     "hf-tag-sel-collisions": {
         "fillHistograms": "true",
+        "xVertexMin": "-100",
+        "xVertexMax": "100",
+        "yVertexMin": "-100",
+        "yVertexMax": "100",
+        "zVertexMin": "-100",
+        "zVertexMax": "100",
+        "nContribMin": "0",
+        "chi2Max": "0",
         "triggerClassName": ""
     },
     "hf-tag-sel-tracks": {
diff --git a/codeHF/workflows.yml b/codeHF/workflows.yml
index c49e802a..4751f0ca 100644
--- a/codeHF/workflows.yml
+++ b/codeHF/workflows.yml
@@ -26,22 +26,22 @@ workflows:
     executable: o2-analysis-hf-track-index-skims-creator
     tables: [HFSELTRACK, HFTRACKIDXP2, HFTRACKIDXP3]
 
-  o2-analysis-hf-track-index-skims-creator-evsel:
+  o2-analysis-hf-track-index-skims-creator-trigsel:
     <<: *skim_creator
     dependencies: [o2-analysis-timestamp, o2-analysis-event-selection]
-    options: "--doEvSel"
+    options: "--doTrigSel"
     tables: [HFSELCOL, HFSELTRACK, HFTRACKIDXP2, HFTRACKIDXP3]
 
   o2-analysis-hf-track-index-skims-creator-v0:
     <<: *skim_creator
     dependencies: o2-analysis-lambdakzerobuilder
-    options: "--do-LcK0Sp"
+    options: "--doCascades"
     tables: [HFSELTRACK, HFTRACKIDXCASC, HFTRACKIDXP2, HFTRACKIDXP3]
 
-  o2-analysis-hf-track-index-skims-creator-evsel-v0:
+  o2-analysis-hf-track-index-skims-creator-trigsel-v0:
     <<: *skim_creator
     dependencies: [o2-analysis-timestamp, o2-analysis-event-selection, o2-analysis-lambdakzerobuilder]
-    options: ["--doEvSel", "--do-LcK0Sp"]
+    options: ["--doTrigSel", "--doCascades"]
     tables: [HFSELCOL, HFSELTRACK, HFTRACKIDXCASC, HFTRACKIDXP2, HFTRACKIDXP3]
 
   # Candidate creators