diff --git a/mini-tps.spec b/mini-tps.spec
index 745d5f5..a2a9f79 100644
--- a/mini-tps.spec
+++ b/mini-tps.spec
@@ -1,6 +1,6 @@
 Name: mini-tps
 Version: 0.1
-Release: 163%{?dist}
+Release: 164%{?dist}
 Summary: Mini TPS - Test Package Sanity
 
 License: GPLv2
@@ -64,6 +64,9 @@ install -pD -m 0755 profiles/fedora/prepare-system %{buildroot}%{_libexecdir}/mi
 
 
 %changelog
+* Tue Jan 02 2024 Jiri Popelka <jpopelka@redhat.com> - 0.1-164
+- viewer (generate-result-json) related updates
+
 * Thu Dec 07 2023 Jiri Popelka <jpopelka@redhat.com> - 0.1-163
 - Remove the Requires: python-gobject-base
 - Move Requires: to mini-tps.conf
diff --git a/mtps-get-task b/mtps-get-task
index 34464b2..14f3703 100755
--- a/mtps-get-task
+++ b/mtps-get-task
@@ -587,6 +587,7 @@ LOGS_DIR="$(realpath "$LOGS_DIR")"
 while true; do
     TESTRUN_ID="$(date +%H%M%S)"
     logfname="${LOGS_DIR%%/}/${TESTRUN_ID}-${TASK}-mtps-get-task.log"
+    logfname_skip="$(dirname "$logfname")/SKIP-$(basename "$logfname")"
     logfname_pass="$(dirname "$logfname")/PASS-$(basename "$logfname")"
     logfname_fail="$(dirname "$logfname")/FAIL-$(basename "$logfname")"
     if [[ -e "$logfname" || -e "$logfname_pass" || -e "$logfname_fail" ]]; then
@@ -602,8 +603,10 @@ do_clean_exit() {
     rc=$?
     trap - SIGINT SIGTERM SIGABRT EXIT # clear the trap
     new_logfname="$logfname_fail"
-    if [ "$rc" = "0" ]; then
+    if [[ "$rc" -eq 0 ]]; then
         new_logfname="$logfname_pass"
+    elif [[ "$rc" -eq $RET_NO_RPMS_IN_BREW || "$rc" -eq $RET_NO_RPMS_IN_REPOS ]]; then
+        new_logfname="$logfname_skip"
     fi
     # Close tee pipes
     for pid in $(ps -o pid --no-headers --ppid $$); do
@@ -704,7 +707,7 @@ if [ -n "$SRPM" ]; then
 fi
 
 if [ -z "${rpms_from_task_all}${rpms_from_task_noarch_all}" ]; then
-    echo "There are no x86_64/noarch RPMs for Brew task $TASK"
+    echo "There are no x86_64/noarch RPMs for Brew/Koji task $TASK"
     exit "$RET_NO_RPMS_IN_BREW"
 fi
 
diff --git a/viewer/generate-result-json b/viewer/generate-result-json
index d0fbb07..fff6a74 100755
--- a/viewer/generate-result-json
+++ b/viewer/generate-result-json
@@ -5,7 +5,7 @@ import json
 from collections import defaultdict
 from pathlib import Path
 
-RESULTS_MAPPING = {"PASS": "OK", "WARN": "INFO", "FAIL": "BAD"}
+RESULTS_MAPPING = {"SKIP": "SKIP", "PASS": "OK", "WARN": "INFO", "FAIL": "BAD"}
 
 mtps_log_dir = Path(sys.argv[1])
 
diff --git a/viewer/viewer.html b/viewer/viewer.html
index 7d49dbd..224ba8f 100644
--- a/viewer/viewer.html
+++ b/viewer/viewer.html
@@ -130,7 +130,7 @@ <h2>Installability</h2>
 
     // Compute an overall result for inspections
     // Return a list of { name, results: [...], result } objects
-    // results is a list of all occuring result types, sorted like RESULTS
+    // results is a list of all occurring result types, sorted like RESULTS
     // result is the most severe of results (i.e. last array item)
     function getInspectionResults(report) {
       const inspections = [];
@@ -282,7 +282,7 @@ <h2>Installability</h2>
       if (response.ok) renderResults(await response.json());
       else
         renderError(
-          `Failed to fetch ${url}: ${response.status} ${response.statusText}`,
+          `Failed to render fetched ${url}: ${response.status} ${response.statusText}`,
         );
     } catch (error) {
       renderError(`Failed to fetch ${url}: ${error}`);