diff --git a/cypress/e2e/tests/migration/dynamic-report/issues/filter.sorting.pagination.test.ts b/cypress/e2e/tests/migration/dynamic-report/issues/filter.sorting.pagination.test.ts
index d5045d514..036b638b4 100644
--- a/cypress/e2e/tests/migration/dynamic-report/issues/filter.sorting.pagination.test.ts
+++ b/cypress/e2e/tests/migration/dynamic-report/issues/filter.sorting.pagination.test.ts
@@ -240,7 +240,7 @@ describe(["@tier3"], "Filtering, sorting and pagination in Issues", function ()
     });
 
     allIssuesSortByList.forEach((column) => {
-        it("All issues - Sort issues by ${column}", function () {
+        it(`All issues - Sort issues by ${column}`, function () {
             Issues.openList();
             validateSortBy(column);
         });
@@ -265,7 +265,11 @@ describe(["@tier3"], "Filtering, sorting and pagination in Issues", function ()
     });
 
     affectedApplicationSortByList.forEach((column) => {
-        it(`Affected applications - sort by ${column}`, function () {
+        let title =
+            column === "Effort"
+                ? `Bug MTA-4323: Affected applications - sort by ${column}`
+                : `Affected applications - sort by ${column}`;
+        it(title, function () {
             Issues.openAffectedApplications(
                 this.analysisData["source_analysis_on_bookserverapp"]["issues"][0]["name"]
             );
diff --git a/cypress/fixtures/analysis.json b/cypress/fixtures/analysis.json
index 89849f096..7f1086b2c 100644
--- a/cypress/fixtures/analysis.json
+++ b/cypress/fixtures/analysis.json
@@ -165,6 +165,32 @@
                 "ruleSet": "quarkus/springboot",
                 "rule": "springboot-di-to-quarkus-00000",
                 "labels": ["None"]
+            },
+            {
+                "name": "Version of Spring Boot not compatible with Jakarta EE 9+",
+                "category": "mandatory",
+                "sources": ["None"],
+                "targets": ["jakarta-ee", "jakarta-ee9+", "jws", "jws6+"],
+                "effort": 3,
+                "totalEffort": 1,
+                "incidents": 1,
+                "affectedFiles": 1,
+                "ruleSet": "jakarta-ee9",
+                "rule": "spring-components-00001",
+                "labels": ["konveyor.io/source"]
+            },
+            {
+                "name": "Version of Spring not compatible with Jakarta EE 9+",
+                "category": "mandatory",
+                "sources": ["None"],
+                "targets": ["jakarta-ee", "jakarta-ee9+", "jws", "jws6+"],
+                "effort": 3,
+                "totalEffort": 1,
+                "incidents": 1,
+                "affectedFiles": 1,
+                "ruleSet": "quarkus/springboot",
+                "rule": "spring-components-00002",
+                "labels": ["konveyor.io/source"]
             }
         ],
         "dependencies": [
@@ -436,6 +462,49 @@
                 "rule": "jms-to-reactive-quarkus-00010",
                 "labels": []
             },
+
+            {
+                "name": "@Produces cannot annotate an EntityManager",
+                "category": "potential",
+                "sources": ["jakarta-ee", "java-ee"],
+                "targets": ["quarkus"],
+                "effort": 1,
+                "totalEffort": 1,
+                "incidents": 1,
+                "affectedFiles": 1,
+                "ruleSet": "quarkus/springboot",
+                "rule": "persistence-to-quarkus-00011",
+                "labels": []
+            },
+
+            {
+                "name": "@Stateful annotation must be replaced",
+                "category": "mandatory",
+                "sources": ["jakarta-ee", "java-ee"],
+                "targets": ["quarkus"],
+                "effort": 3,
+                "totalEffort": 3,
+                "incidents": 1,
+                "affectedFiles": 1,
+                "ruleSet": "quarkus/springboot",
+                "rule": "persistence-to-quarkus-00011",
+                "labels": []
+            },
+
+            {
+                "name": "@Stateless annotation must be replaced",
+                "category": "potential",
+                "sources": ["jakarta-ee", "java-ee"],
+                "targets": ["quarkus"],
+                "effort": 1,
+                "totalEffort": 1,
+                "incidents": 1,
+                "affectedFiles": 1,
+                "ruleSet": "quarkus/springboot",
+                "rule": "persistence-to-quarkus-00011",
+                "labels": []
+            },
+
             {
                 "name": "`beans.xml` descriptor content is ignored",
                 "category": "potential",
@@ -540,6 +609,34 @@
                 "rule": "jms-to-reactive-quarkus-00020",
                 "labels": []
             },
+            {
+                "name": "File system - Java IO",
+                "category": "mandatory",
+                "sources": ["None"],
+                "targets": ["cloud-readiness"],
+                "effort": 1,
+                "totalEffort": 6,
+                "incidents": 6,
+                "affectedFiles": 1,
+                "ruleSet": "cloud-readiness",
+                "rule": "local-storage-00001",
+                "labels": ["konveyor.io/source", "storage"]
+            },
+
+            {
+                "name": "File system - java.net.URL/URI",
+                "category": "mandatory",
+                "sources": ["None"],
+                "targets": ["cloud-readiness"],
+                "effort": 1,
+                "totalEffort": 1,
+                "incidents": 1,
+                "affectedFiles": 1,
+                "ruleSet": "cloud-readiness",
+                "rule": "local-storage-00002",
+                "labels": ["konveyor.io/source", "storage"]
+            },
+
             {
                 "name": "Implicit name determination for sequences and tables associated with identifier generation has changed",
                 "category": "potential",
@@ -553,6 +650,47 @@
                 "rule": "hibernate-00005",
                 "labels": ["hibernate", "konveyor.io/source"]
             },
+
+            {
+                "name": "Java API for XML-based RPC (JAX-RPC)",
+                "category": "optional",
+                "sources": ["java", "rpc"],
+                "targets": ["cloud-readiness"],
+                "effort": 5,
+                "totalEffort": 5,
+                "incidents": 1,
+                "affectedFiles": 1,
+                "ruleSet": "cloud-readiness",
+                "rule": "java-rpc-00000",
+                "labels": ["rpc"]
+            },
+            {
+                "name": "Java Mail API",
+                "category": "optional",
+                "sources": ["java", "java-ee"],
+                "targets": ["cloud-readiness"],
+                "effort": 3,
+                "totalEffort": 3,
+                "incidents": 1,
+                "affectedFiles": 1,
+                "ruleSet": "cloud-readiness",
+                "rule": "mail-00000",
+                "labels": ["mail"]
+            },
+            {
+                "name": "Java Remote Method Invocation (RMI) service",
+                "category": "mandatory",
+                "sources": ["java", "rmi"],
+                "targets": ["cloud-readiness"],
+                "effort": 1,
+                "totalEffort": 1,
+                "incidents": 1,
+                "affectedFiles": 1,
+                "ruleSet": "cloud-readiness",
+                "rule": "java-rmi-00000",
+                "labels": ["cloud-readiness", "rmi"]
+            },
+
             {
                 "name": "javax groupId has been replaced by jakarta.platform",
                 "category": "mandatory",
@@ -657,6 +795,21 @@
                 "rule": "persistence-to-quarkus-00000",
                 "labels": []
             },
+
+            {
+                "name": "Producer annotation no longer required",
+                "category": "potential",
+                "sources": ["java-ee"],
+                "targets": ["quarkus"],
+                "effort": 1,
+                "totalEffort": 1,
+                "incidents": 1,
+                "affectedFiles": 1,
+                "ruleSet": "quarkus/springboot",
+                "rule": "cdi-to-quarkus-00040",
+                "labels": []
+            },
+
             {
                 "name": "Remote EJBs are not supported in Quarkus",
                 "category": "mandatory",
diff --git a/cypress/utils/utils.ts b/cypress/utils/utils.ts
index 85b383eff..6bc9dcbe5 100644
--- a/cypress/utils/utils.ts
+++ b/cypress/utils/utils.ts
@@ -120,9 +120,14 @@ export function inputText(fieldId: string, text: any, log = false): void {
     if (!log) {
         cy.log(`Type ${text} in ${fieldId}`);
     }
-    cy.get(fieldId, { log }).click({ log }).focused({ log }).clear({ log });
+    cy.get(fieldId, { log, timeout: 30 * SEC })
+        .click({ log })
+        .focused({ log })
+        .clear({ log });
     cy.wait(200, { log });
-    cy.get(fieldId, { log }).clear({ log }).type(text, { log });
+    cy.get(fieldId, { log, timeout: 30 * SEC })
+        .clear({ log })
+        .type(text, { log });
 }
 
 export function clearInput(fieldID: string): void {