diff --git a/.github/actions/rdcp-conformance/action.yml b/.github/actions/rdcp-conformance/action.yml
index 79ea3e6..ab5c9f3 100644
--- a/.github/actions/rdcp-conformance/action.yml
+++ b/.github/actions/rdcp-conformance/action.yml
@@ -48,12 +48,11 @@ runs:
     - name: Discovery
       shell: bash
       run: |
-        npx rdcp-conformance --base-url="${{ inputs.base-url }}" --out="${{ inputs.discovery-out }}" \
-          ${INPUT_INCLUDE:+--include-tags="${{ inputs.include-tags }}"} \
-          ${INPUT_EXCLUDE:+--exclude-tags="${{ inputs.exclude-tags }}"} || \
-        node scripts/rdcp-conformance.mjs --base-url="${{ inputs.base-url }}" --out="${{ inputs.discovery-out }}" \
-          ${INPUT_INCLUDE:+--include-tags="${{ inputs.include-tags }}"} \
-          ${INPUT_EXCLUDE:+--exclude-tags="${{ inputs.exclude-tags }}"}
+        FLAGS=""
+        if [ -n "${{ inputs.include-tags }}" ]; then FLAGS="$FLAGS --include-tags=\"${{ inputs.include-tags }}\""; fi
+        if [ -n "${{ inputs.exclude-tags }}" ]; then FLAGS="$FLAGS --exclude-tags=\"${{ inputs.exclude-tags }}\""; fi
+        npx rdcp-conformance --base-url="${{ inputs.base-url }}" --out="${{ inputs.discovery-out }}" $FLAGS || \
+        node scripts/rdcp-conformance.mjs --base-url="${{ inputs.base-url }}" --out="${{ inputs.discovery-out }}" $FLAGS
     - name: Run tests (conformance-mode)
       shell: bash
       run: npm test
diff --git a/.wiki-edit b/.wiki-edit
index ea7de41..6dc6c90 160000
--- a/.wiki-edit
+++ b/.wiki-edit
@@ -1 +1 @@
-Subproject commit ea7de410eb3bc3543ea4d251325eef20c5ace10c
+Subproject commit 6dc6c90e9455dd91cf8499e7d9232473051c1fc2