diff --git a/dal/db_query/queries.sql b/dal/db_query/queries.sql
index 7d6aa29..1dedf0d 100644
--- a/dal/db_query/queries.sql
+++ b/dal/db_query/queries.sql
@@ -539,13 +539,7 @@ WITH Funnel AS (
         q.title AS question_title,
         a.content AS answer_content,
         CAST(
-            CASE
-                WHEN COUNT(*) * 100.0 / NULLIF(SUM(COUNT(*)) OVER (PARTITION BY q.id), 0) - TRUNC(COUNT(*) * 100.0 / NULLIF(SUM(COUNT(*)) OVER (PARTITION BY q.id), 0)) >= 0.5 THEN
-                    CEIL(COUNT(*) * 100.0 / NULLIF(SUM(COUNT(*)) OVER (PARTITION BY q.id), 0))
-                ELSE
-                    FLOOR(COUNT(*) * 100.0 / NULLIF(SUM(COUNT(*)) OVER (PARTITION BY q.id), 0))
-            END 
-            AS INTEGER
+            COUNT(CASE WHEN a.result = FALSE THEN 1 ELSE NULL END) * 100.0 / NULLIF(SUM(COUNT(CASE WHEN a.result = FALSE THEN 1 ELSE NULL END)) OVER (PARTITION BY q.id), 0) AS INTEGER
         ) AS percentage
     FROM
         question q
@@ -554,13 +548,6 @@ WITH Funnel AS (
         a.quiz_id = $1
         AND a.created_at >= TO_TIMESTAMP($2)
         AND a.created_at <= TO_TIMESTAMP($3)
-        AND q.id NOT IN (
-            SELECT DISTINCT q.id
-            FROM question q
-            JOIN answer a ON q.id = a.question_id
-            WHERE a.quiz_id = $1
-              AND a.result = TRUE
-        ) 
     GROUP BY
         q.id, q.title, a.content
     HAVING
diff --git a/dal/sqlcgen/queries.sql.go b/dal/sqlcgen/queries.sql.go
index 4634706..26fd097 100644
--- a/dal/sqlcgen/queries.sql.go
+++ b/dal/sqlcgen/queries.sql.go
@@ -1633,13 +1633,7 @@ WITH Funnel AS (
         q.title AS question_title,
         a.content AS answer_content,
         CAST(
-            CASE
-                WHEN COUNT(*) * 100.0 / NULLIF(SUM(COUNT(*)) OVER (PARTITION BY q.id), 0) - TRUNC(COUNT(*) * 100.0 / NULLIF(SUM(COUNT(*)) OVER (PARTITION BY q.id), 0)) >= 0.5 THEN
-                    CEIL(COUNT(*) * 100.0 / NULLIF(SUM(COUNT(*)) OVER (PARTITION BY q.id), 0))
-                ELSE
-                    FLOOR(COUNT(*) * 100.0 / NULLIF(SUM(COUNT(*)) OVER (PARTITION BY q.id), 0))
-            END 
-            AS INTEGER
+            COUNT(CASE WHEN a.result = FALSE THEN 1 ELSE NULL END) * 100.0 / NULLIF(SUM(COUNT(CASE WHEN a.result = FALSE THEN 1 ELSE NULL END)) OVER (PARTITION BY q.id), 0) AS INTEGER
         ) AS percentage
     FROM
         question q
@@ -1648,13 +1642,6 @@ WITH Funnel AS (
         a.quiz_id = $1
         AND a.created_at >= TO_TIMESTAMP($2)
         AND a.created_at <= TO_TIMESTAMP($3)
-        AND q.id NOT IN (
-            SELECT DISTINCT q.id
-            FROM question q
-            JOIN answer a ON q.id = a.question_id
-            WHERE a.quiz_id = $1
-              AND a.result = TRUE
-        ) 
     GROUP BY
         q.id, q.title, a.content
     HAVING