diff --git a/yb-voyager/cmd/analyzeSchema.go b/yb-voyager/cmd/analyzeSchema.go
index 8ff11381a5..eacf247c51 100644
--- a/yb-voyager/cmd/analyzeSchema.go
+++ b/yb-voyager/cmd/analyzeSchema.go
@@ -222,18 +222,17 @@ const (
 
 // Reports one case in JSON
 func reportCase(filePath string, reason string, ghIssue string, suggestion string, objType string, objName string, sqlStmt string, category string, docsLink string, impact string) {
-	var issue utils.AnalyzeSchemaIssue
-	issue.FilePath = filePath
-	issue.Reason = reason
-	issue.GH = ghIssue
-	issue.Suggestion = suggestion
-	issue.ObjectType = objType
-	issue.ObjectName = objName
-	issue.SqlStatement = sqlStmt
-	issue.IssueType = category // IssueType field of analyze schema should be renamed to Category
-	issue.Impact = lo.Ternary(impact != "", impact, constants.IMPACT_LEVEL_1)
-	if sourceDBType == POSTGRESQL {
-		issue.DocsLink = docsLink
+	issue := utils.AnalyzeSchemaIssue{
+		IssueType:    category, // TODO: to be replaced with Category as a field
+		Reason:       reason,
+		Impact:       lo.Ternary(impact != "", impact, constants.IMPACT_LEVEL_1),
+		ObjectType:   objType,
+		ObjectName:   objName,
+		SqlStatement: sqlStmt,
+		FilePath:     filePath,
+		Suggestion:   suggestion,
+		GH:           ghIssue,
+		DocsLink:     docsLink,
 	}
 
 	schemaAnalysisReport.Issues = append(schemaAnalysisReport.Issues, issue)
@@ -663,10 +662,8 @@ func convertIssueInstanceToAnalyzeIssue(issueInstance queryissue.QueryIssue, fil
 		// 2. Keep it in issue.Details and write logic in UI layer to construct display name.
 	*/
 	displayObjectName := issueInstance.ObjectName
-
-	constraintName, ok := issueInstance.Details[queryissue.CONSTRAINT_NAME]
-	if slices.Contains(constraintIssues, issueInstance.Type) && ok {
-		//In case of constraint issues we add constraint name to the object name as well
+	if constraintName, ok := issueInstance.Details[queryissue.CONSTRAINT_NAME]; slices.Contains(constraintIssues, issueInstance.Type) && ok {
+		//In case of constraint issues we add constraint name to the object name to achieve the uniqueness
 		displayObjectName = fmt.Sprintf("%s, constraint: (%s)", issueInstance.ObjectName, constraintName)
 	}
 
@@ -676,8 +673,8 @@ func convertIssueInstanceToAnalyzeIssue(issueInstance queryissue.QueryIssue, fil
 		IssueType:              issueType,
 		ObjectType:             issueInstance.ObjectType,
 		ObjectName:             displayObjectName,
-		Reason:                 issueInstance.Name,
 		Type:                   issueInstance.Type,
+		Reason:                 issueInstance.Name,
 		Impact:                 issueInstance.Impact,
 		SqlStatement:           issueInstance.SqlStatement,
 		DocsLink:               issueInstance.DocsLink,
diff --git a/yb-voyager/cmd/assessMigrationCommand.go b/yb-voyager/cmd/assessMigrationCommand.go
index 586610676f..e508040bea 100644
--- a/yb-voyager/cmd/assessMigrationCommand.go
+++ b/yb-voyager/cmd/assessMigrationCommand.go
@@ -1013,13 +1013,12 @@ func getUnsupportedFeaturesFromSchemaAnalysisReport(featureName string, issueRea
 	return UnsupportedFeature{featureName, objects, displayDDLInHTML, link, description, minVersionsFixedIn}
 }
 
-// Q: do we no need of displayDDLInHTML in this approach? DDL can always be there for issues in the table if present.
 func convertAnalyzeSchemaIssueToAssessmentIssue(analyzeSchemaIssue utils.AnalyzeSchemaIssue, issueDescription string, minVersionsFixedIn map[string]*ybversion.YBVersion) AssessmentIssue {
 	return AssessmentIssue{
 		Category:              analyzeSchemaIssue.IssueType,
 		CategoryDescription:   GetCategoryDescription(analyzeSchemaIssue.IssueType),
 		Type:                  analyzeSchemaIssue.Type,
-		Name:                  analyzeSchemaIssue.Reason, // in convertIssueInstanceToAnalyzeIssue() we assign IssueType to Reason field
+		Name:                  analyzeSchemaIssue.Reason, // in convertIssueInstanceToAnalyzeIssue() we assign Issue.Name to AnalyzeSchemaIssue.Reason field
 		Description:           issueDescription,          // TODO: verify
 		Impact:                analyzeSchemaIssue.Impact,
 		ObjectType:            analyzeSchemaIssue.ObjectType,
@@ -1655,6 +1654,8 @@ func generateAssessmentReportHtml(reportDir string) error {
 		"groupByObjectName":                groupByObjectName,
 		"totalUniqueObjectNamesOfAllTypes": totalUniqueObjectNamesOfAllTypes,
 		"getSupportedVersionString":        getSupportedVersionString,
+		"snakeCaseToTitleCase":             utils.SnakeCaseToTitleCase,
+		"getSqlPreview":                    utils.GetSqlStmtToPrint,
 	}
 	tmpl := template.Must(template.New("report").Funcs(funcMap).Parse(string(bytesTemplate)))
 
diff --git a/yb-voyager/cmd/common.go b/yb-voyager/cmd/common.go
index 4c9f34138c..ff2f6ffd1c 100644
--- a/yb-voyager/cmd/common.go
+++ b/yb-voyager/cmd/common.go
@@ -1073,12 +1073,12 @@ type AssessmentReport struct {
 
 // Fields apart from Category, CategoryDescription, TypeName and Impact will be populated only if/when available
 type AssessmentIssue struct {
-	Category              string // expected values: feature, query_constrcuts, migration_caveats, plpgsql_objects, datatytpe
+	Category              string // expected values: unsupported_features, unsupported_query_constructs, migration_caveats, unsupported_plpgsql_objects, unsupported_datatype
 	CategoryDescription   string
 	Type                  string // Ex: GIN_INDEXES, SECURITY_INVOKER_VIEWS, STORED_GENERATED_COLUMNS
 	Name                  string // Ex: "Stored generated columns are not supported."
 	Description           string
-	Impact                string // Level-1, Level-2, Level-3 (default: Level-1 ??)
+	Impact                string // Level-1, Level-2, Level-3 (no default: need to be assigned for each issue)
 	ObjectType            string // For datatype category, ObjectType will be datatype (for eg "geometry")
 	ObjectName            string
 	SqlStatement          string
diff --git a/yb-voyager/cmd/migration_complexity.go b/yb-voyager/cmd/migration_complexity.go
index 69b71d1d3b..ca263f7f65 100644
--- a/yb-voyager/cmd/migration_complexity.go
+++ b/yb-voyager/cmd/migration_complexity.go
@@ -221,9 +221,9 @@ const explainTemplateHTML = `
 		<thead>
 			<tr>
 				<th>Category</th>
-				<th>Level-1</th>
-				<th>Level-2</th>
-				<th>Level-3</th>
+				<th>Level 1</th>
+				<th>Level 2</th>
+				<th>Level 3</th>
 				<th>Total</th>
 			</tr>
 		</thead>
@@ -248,9 +248,9 @@ const explainTemplateHTML = `
 
 <p>
 <strong>Impact Levels:</strong></br>
-	Level-1: Resolutions are available with minimal effort.<br/>
-	Level-2: Resolutions are available requiring moderate effort.<br/>
-	Level-3: Resolutions may not be available or are complex.
+	Level 1: Resolutions are available with minimal effort.<br/>
+	Level 2: Resolutions are available requiring moderate effort.<br/>
+	Level 3: Resolutions may not be available or are complex.
 </p>
 `
 
@@ -301,11 +301,11 @@ func buildMigrationComplexityExplanation(sourceDBType string, assessmentReport A
 func buildRationale(finalComplexity string, l1Count int, l2Count int, l3Count int) string {
 	switch finalComplexity {
 	case constants.MIGRATION_COMPLEXITY_HIGH:
-		return fmt.Sprintf("Found %d Level-2 issue(s) and %d Level-3 issue(s), resulting in HIGH migration complexity", l2Count, l3Count)
+		return fmt.Sprintf("Found %d Level 2 issue(s) and %d Level 3 issue(s), resulting in HIGH migration complexity", l2Count, l3Count)
 	case constants.MIGRATION_COMPLEXITY_MEDIUM:
-		return fmt.Sprintf("Found %d Level-1 issue(s), %d Level-2 issue(s) and %d Level-3 issue(s), resulting in MEDIUM migration complexity", l1Count, l2Count, l3Count)
+		return fmt.Sprintf("Found %d Level 1 issue(s), %d Level 2 issue(s) and %d Level 3 issue(s), resulting in MEDIUM migration complexity", l1Count, l2Count, l3Count)
 	case constants.MIGRATION_COMPLEXITY_LOW:
-		return fmt.Sprintf("Found %d Level-1 issue(s) and %d Level-2 issue(s), resulting in LOW migration complexity", l1Count, l2Count)
+		return fmt.Sprintf("Found %d Level 1 issue(s) and %d Level 2 issue(s), resulting in LOW migration complexity", l1Count, l2Count)
 	}
 	return ""
 }
diff --git a/yb-voyager/cmd/templates/migration_assessment_report.template b/yb-voyager/cmd/templates/migration_assessment_report.template
index eeef96253b..9f4f4a97a2 100644
--- a/yb-voyager/cmd/templates/migration_assessment_report.template
+++ b/yb-voyager/cmd/templates/migration_assessment_report.template
@@ -25,12 +25,15 @@
             border-collapse: collapse;
             width: 100%;
             margin-top: 20px;
+            table-layout: fixed;
         }
         th, td {
             border: 1px solid #ddd;
             padding: 8px;
             text-align: left;
             vertical-align: top; /* Vertically center content in table cells */
+            word-wrap: break-word;
+            white-space: normal;
         }
         th {
             background-color: #f2f2f2;
@@ -65,12 +68,116 @@
             overflow-wrap: break-word; /* Same as word-wrap but for newer browsers */
             white-space: pre-wrap; /* Preserve whitespace and allow wrapping */
             word-break: break-all; /* Prevents long words from overflowing */
-            margin: 0; /* Remove default margins */
-            padding: 0; /* Remove default padding */
+            margin: 5px; /* Remove default margins */
+            padding: 5px; /* Remove default padding */
             font-family: monospace; /* Optional: ensure a monospaced font */
         }
-
+        .table-highlight thead tr {
+            background-color: #f2f2f2;
+            font-weight: bold;
+            border-bottom: 2px solid #ccc; /* a visual separator from the body */
+        }
+        .summary-row {
+            cursor: pointer;
+            border-bottom:2px solid #000;
+        }
+        .details-row {
+            background-color: #fafafa;
+            border-bottom:2px solid #ccc;
+        }
+        /* Container for the top summary + buttons */
+        .assessment-issues-header {
+            display: flex;                /* enable flex layout */
+            justify-content: space-between; /* pushes left content to one side, buttons to the other */
+            align-items: center;            /* vertically center items */
+            margin-bottom: 1rem;            /* space before the table */
+        }
+        .assessment-issues-header p {
+            margin: 0;        /* remove default paragraph margins or adjust to your liking */
+            margin-bottom: 4px;
+        }
+        /* Container for the buttons on the right */
+        .assessment-issues-header .buttons {
+            display: flex;         /* let buttons sit side by side */
+            gap: 5px;              /* small space between them */
+        }
+        .rounded-button {
+            padding: 6px 12px;
+            border-radius: 9999px; /* pill shape */
+            border: 1px solid #ccc;
+            background-color: #f9f9f9;
+            cursor: pointer;
+            font-size: 0.9rem;
+        }
+        .rounded-button:hover {
+            background-color: #eee;
+        }
     </style>
+    <script>
+        function toggleDetails(detailsRowId, arrowId) {
+            var detailsRow = document.getElementById(detailsRowId);
+            var arrow = document.getElementById(arrowId);
+            if (detailsRow.style.display === "none" || detailsRow.style.display === "") {
+                detailsRow.style.display = "table-row"; // Show the row
+                arrow.innerHTML = "&#x25BC;";   // Down arrow
+            } else {
+                detailsRow.style.display = "none"; // Hide the row
+                arrow.innerHTML = "&#x25B6;"; // Right arrow
+            }
+        }
+        function expandAllIssues() {
+            // Suppose each details row has an ID pattern "details-i" and an arrow with ID "arrow-i"
+            totalIssues = {{ len .Issues }};
+            for (let i = 0; i < totalIssues; i++) {
+                document.getElementById('details-' + i).style.display = 'table-row';
+                document.getElementById('arrow-' + i).innerHTML = '&#x25BC;';
+            }
+        }
+        function collapseAllIssues() {
+            totalIssues = {{ len .Issues }};
+            for (let i = 0; i < totalIssues; i++) {
+                document.getElementById('details-' + i).style.display = 'none';
+                document.getElementById('arrow-' + i).innerHTML = '&#x25B6;';
+            }
+        }
+
+        // Keep track of the current sort direction per field, so we can toggle it
+        let sortState = {
+            category: 'asc',
+            type: 'asc',
+            impact: 'asc'
+        };
+        function sortTableBy(field) {
+            // Grab the table element
+            const table = document.querySelector(".table-highlight");
+
+            // Collect all the .issue-pair <tbody> elements
+            const issuePairs = Array.from(table.querySelectorAll("tbody.issue-summary-detail-pair"));
+
+            // Determine the current sort direction and flip it
+            let currentDirection = sortState[field] || 'asc';
+            let newDirection = (currentDirection === 'asc') ? 'desc' : 'asc';
+            sortState[field] = newDirection;
+
+            issuePairs.sort((a, b) => {
+                let aValue = a.dataset[field] || "";
+                let bValue = b.dataset[field] || "";
+
+                if (aValue < bValue) return newDirection === 'asc' ? -1 : 1;
+                if (aValue > bValue) return newDirection === 'asc' ? 1 : -1;
+                return 0;
+            });
+
+            // Re-append the sorted <tbody> elements to the table
+            issuePairs.forEach(pair => table.appendChild(pair));
+
+            // Update the sort indicator in the table header
+            const sortIndicator = table.querySelector(`th[onclick="sortTableBy('${field}')"] .sort-indicator`);
+            if (sortIndicator) {
+                sortIndicator.innerHTML = newDirection === 'asc' ? '&#8593;' : '&#8595;'; // &#8593; is up arrow, &#8595; is down arrow
+            }
+        }
+    </script>
 </head>
 <body>
     <div class="wrapper">
@@ -90,10 +197,8 @@
 
         <p><strong>Target YB Version:</strong> {{.TargetDBVersion}} </p>
 
-        {{if eq .MigrationComplexity "NOT AVAILABLE"}}
-        <!-- Do nothing -->
-        {{else}} 
-        <p><strong>Migration Complexity:</strong> {{ .MigrationComplexity }}</p>
+        {{if ne .MigrationComplexity "NOT AVAILABLE"}}
+            <p><strong>Migration Complexity:</strong> {{ .MigrationComplexity }}</p>
         {{end}}
 
         <h2>Database Objects</h2>
@@ -172,246 +277,168 @@
             <p>{{ .MigrationComplexityExplanation }}</p>
         {{end}}
 
-        <h2>Unsupported Data Types</h2>
-        <p>{{.UnsupportedDataTypesDesc}}</p>
-        {{ if .UnsupportedDataTypes }}
-            <div class="scrollable-div">
-                <table class="formatted_table">
-                    <tr>
-                        <th>Schema</th>
-                        <th>Table</th>
-                        <th>Column</th>
-                        <th>Data Type</th>
-                    </tr>
-                    {{range .UnsupportedDataTypes}}
-                    <tr>
-                        <td>{{.SchemaName}}</td>
-                        <td>{{.TableName}}</td>
-                        <td>{{.ColumnName}}</td>
-                        <td>{{.DataType}}</td>
-                    </tr>
-                    {{end}}
-                </table>
+        <h2>Assessment Issues</h2>
+        {{ if .Issues }}
+        <div class="assessment-issues-header">
+            <!-- Left area: text about total issues -->
+            <div>
+                <p><strong>Total Issues: </strong>{{ len .Issues }}</p>
+                <p>Below is a detailed breakdown of each issue.</p>
             </div>
-        {{ else }}
-            <p>No unsupported data types present in the assessed schemas.</p>
-        {{ end }}
-
-        <h2>Unsupported Features</h2>
-        <p>{{.UnsupportedFeaturesDesc}}</p>
-        {{ $hasUnsupportedFeatures := false }}
-        {{range .UnsupportedFeatures}}
-            {{if .Objects}} <!-- Check if Objects is not empty -->
-                {{ $hasUnsupportedFeatures = true }}
-                {{if .DisplayDDL }} <!-- for these feature we are displaying the DDLs-->
-                    <h4>{{.FeatureName}}</h4>
-                    {{ $supporterVerStr := getSupportedVersionString .MinimumVersionsFixedIn }}
-                    {{ if $supporterVerStr }}
-                    <p>Supported in Versions: {{ $supporterVerStr }} </p>
-                    {{ end }}
-                    <div class="scrollable-div">
-                        <ul>
-                            {{range .Objects}}
-                                <li class='list_item'>{{.SqlStatement}}</li>
-                            {{end}}
-                        </ul>
-                    </div>
-                {{else}}
-                    <h4>{{.FeatureName}}</h4>
-                    {{ $supporterVerStr := getSupportedVersionString .MinimumVersionsFixedIn }}
-                    {{ if $supporterVerStr }}
-                    <p>Supported in Versions: {{ $supporterVerStr }} </p>
-                    {{ end }}
-                    <div class="scrollable-div">
-                        <ul>
-                            {{range .Objects}}
-                                <li class='list_item'>{{.ObjectName}}</li>
-                            {{end}}
-                        </ul>
-                    </div>
-                {{end}}
-                {{if .DocsLink}}
-                    <p id="refer-p"><a href="{{.DocsLink}}" target="_blank">Details</a></p>
-                {{end}} 
-            {{end}}
-        {{end}}
-        {{if not $hasUnsupportedFeatures}} <!-- Check if no unsupported features were found -->
-            <p>No unsupported features were present among the ones assessed.</p>
-        {{end}}
+            <!-- Right area: buttons -->
+            <div class="buttons">
+                <button class="rounded-button" onclick="expandAllIssues()">Expand All</button>
+                <button class="rounded-button" onclick="collapseAllIssues()">Collapse All</button>
+            </div>
+        </div>
+        <table class="table-highlight">
+            <!-- Summary Row Header for the issue -->
+            <colgroup>
+                <col style="width: 20%;"> <!-- Category + arrow -->
+                <col style="width: 20%;"> <!-- Type -->  <!-- TODO: replace Type with Name field -->
+                <col style="width: 50%;"> <!-- Object/SQL Preview -->
+                <col style="width: 10%;"> <!-- Impact -->
+            </colgroup>
 
-        <h2>Unsupported Query Constructs</h2>
-        {{ if .UnsupportedQueryConstructs}}
-            <p>Source database queries not supported in YugabyteDB, identified by scanning system tables:</p>
-            <table class="formatted_table">
-                <tr>
-                    <th>Construct Type</th>
-                    <th>Queries</th>
-                    <th>Details</th>
+            <thead>
+                <tr style="background-color: #f2f2f2;">
+                    <th style="cursor: pointer;" onclick="sortTableBy('category')">
+                        Category <span class="sort-indicator">&#8597</span>
+                    </th>
+                    <th style="cursor: pointer;" onclick="sortTableBy('type')">
+                        Type <span class="sort-indicator">&#8597</span>
+                    </th>
+                    <th>Object/SQL Preview</th>
+                    <th style="cursor: pointer;" onclick="sortTableBy('impact')">
+                        Impact <span class="sort-indicator">&#8597</span>
+                    </th>
                 </tr>
-                {{ $currentType := "" }}
-                {{ $docsLink := "" }}
-                {{ $supporterVerStr := "" }}
-                {{ range $i, $construct := .UnsupportedQueryConstructs }}
-                    {{ if ne $construct.ConstructTypeName $currentType }}
-                        {{ if ne $currentType "" }}
-                                </ul>
-                            </div>
-                        </td>
-                        <td>{{ if $supporterVerStr }}
-                            Supported in Versions: {{ $supporterVerStr }}
-                            {{ end }}
-                            {{ if $docsLink }}
-                                <a href="{{ $docsLink }}" target="_blank">Docs Link</a>
-                            {{ else }}
-                                N/A
-                            {{ end }}
-                        </td>
-                        </tr>
-                        {{ end }}
-                        {{ $docsLink = $construct.DocsLink }}
-                        {{ $supporterVerStr = getSupportedVersionString $construct.MinimumVersionsFixedIn }}
-                        <tr>
-                            <td><strong>{{ $construct.ConstructTypeName }}</strong></td>
-                            <td>
-                                <div class="scrollable-div">
-                                    <ul>
-                        {{ $currentType = $construct.ConstructTypeName }}
-                    {{ end }}
-                    <li class="list_item">{{ $construct.Query }}</li>
-                {{ end }}
-                <!-- Close the last construct type -->
-                {{ if ne $currentType "" }}
-                        </ul>
-                    </div>
-                </td>
-                <td>
-                    {{ if $supporterVerStr }}
-                    Supported in Versions: {{ $supporterVerStr }} <br>
-                    {{ end }}
-                    {{ if $docsLink }}
-                        <a href="{{ $docsLink }}" target="_blank">Docs Link</a>
-                    {{ else }}
-                        N/A
-                    {{ end }}
-                </td>
-                </tr>
-                {{ end }}
-            </table>
-        {{ else }}
-            <p>No unsupported query constructs found in the source database for target YugabyteDB.</p>
-        {{ end }}
+            </thead>
 
-        <h2>Unsupported PL/pgSQL objects</h2>
-        {{ if .UnsupportedPlPgSqlObjects}}
-            <p>Source schema objects having unsupported statements in PL/pgSQL code block: </p>
-            <table>
-                <tr>
-                    <th>Feature Name</th>
-                    <th>Object type</th>
-                    <th>Object name</th>
-                    <th>Statement</th>
-                    <th>Details</th>
-                </tr>
-                {{ range  .UnsupportedPlPgSqlObjects }}
-                    <!-- Feature Row with rowspan for grouping -->
-                    <tr>
-                    {{ $objectsGroupByObjectType := groupByObjectType .Objects }}
-                    {{ $numUniqueObjectNamesOfAllTypes := totalUniqueObjectNamesOfAllTypes $objectsGroupByObjectType }}
-                    {{ $docsLink := .DocsLink }}
-                    {{ $supportedVerStr := getSupportedVersionString .MinimumVersionsFixedIn }}
-                    <td rowspan={{ $numUniqueObjectNamesOfAllTypes }}><strong>{{ .FeatureName }}</strong></td>
-                    {{ $isNextRowRequiredForObjectType := false }}
-                    {{ range $type, $objectsByType := $objectsGroupByObjectType }}
-                        {{ $objectGroupByObjectName := groupByObjectName $objectsByType }}
-                        {{ $numUniqueObjectNames := numKeysInMapStringObjectInfo $objectGroupByObjectName }}
-                        {{ if $isNextRowRequiredForObjectType }}
-                            <tr>
-                        {{ end }}
-                        <td rowspan={{ $numUniqueObjectNames }} >{{ $type }}</td>
-                        {{ $isNextRowRequiredForObjectName := false }}
-                        {{ range $name, $objectsByName := $objectGroupByObjectName }}
-                            {{ if $isNextRowRequiredForObjectName }}
-                                <tr>
-                            {{ end }}
-                            <td>{{ $name }}</td>
+            <tbody>
+                {{ range $idx, $issue := .Issues }}
+                    <tbody class="issue-summary-detail-pair"
+                        data-category="{{ $issue.Category }}"
+                        data-type="{{ $issue.Type }}"
+                        data-impact="{{ $issue.Impact }}">
+                        <!-- Summary Row -->
+                        <tr class="summary-row" onclick="toggleDetails('details-{{ $idx }}', 'arrow-{{ $idx }}')">
                             <td>
-                                <div class="scrollable-div">
-                                    <ul>
-                                    {{ range $objectsByName }}
-                                        <li class="list_item"><pre>{{ .SqlStatement }}</pre></li>
-                                    {{ end }}
-                                    </ul>
-                                </div>
+                                <span id="arrow-{{ $idx }}" style="display:inline-block;">&#x25B6;</span>
+                                &nbsp;&nbsp;
+                                {{ snakeCaseToTitleCase $issue.Category }}
                             </td>
-                            {{ if not $isNextRowRequiredForObjectType }}
-                                <td rowspan={{ $numUniqueObjectNamesOfAllTypes }}>
-                                    {{ if $supportedVerStr }}
-                                        Supported in Versions: {{ $supportedVerStr }} <br>
-                                    {{ end }}
-                                    {{ if $docsLink }}
-                                        <a href="{{ $docsLink }}" target="_blank">Docs Link</a>
-                                    {{ else }}
-                                        N/A
-                                    {{ end }}
-                                </td>
-                            {{ end }}
-                            {{ $isNextRowRequiredForObjectName = true }}
-                            {{ $isNextRowRequiredForObjectType = true }}
-                            </tr>
-                        {{ end }}
-                    {{ end }}
+                            <td>{{ snakeCaseToTitleCase $issue.Type }}</td>
+                            <td>
+                                {{ if $issue.ObjectName }}
+                                    {{ $issue.ObjectName }}
+                                {{ else }}
+                                    {{ getSqlPreview $issue.SqlStatement }}
+                                {{ end }}
+                            </td>
+
+                            <td>{{ snakeCaseToTitleCase $issue.Impact }}</td>
+                        </tr>
+
+                        <!-- Hidden Details of the Row -->
+                        <tr id="details-{{ $idx }}" class="details-row" style="display: none;">
+                            <td colspan="4">
+                                <table class="formatted_table" style="width: 100%; border: 1px solid #ddd; margin-top: 5px;">
+                                    <colgroup>
+                                        <col style="width: 25%;">
+                                        <col style="width: 75%;">
+                                    </colgroup>
+                                    <tbody>
+                                        {{ if $issue.CategoryDescription }}
+                                        <tr>
+                                            <th>Category Description</th>
+                                            <td>
+                                                <div style="max-height:150px; overflow-y:auto; border:1px solid #ccc; padding:5px;">
+                                                    {{ $issue.CategoryDescription }}
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        {{ end }}
+
+                                        <!-- Only show if ObjectName is present -->
+                                        {{ if $issue.ObjectName }}
+                                        <tr>
+                                            <th>Object Name</th>
+                                            <td>{{ $issue.ObjectName }}</td>
+                                        </tr>
+                                        {{ end }}
+
+                                        <!-- Only show if ObjectType is present -->
+                                        {{ if $issue.ObjectType }}
+                                        <tr>
+                                            <th>Object Type</th>
+                                            <td>{{ $issue.ObjectType }}</td>
+                                        </tr>
+                                        {{ end }}
+
+
+                                        <tr>
+                                            <th>SQL Statement</th>
+                                            <td>
+                                                {{ if $issue.SqlStatement }}
+                                                <div style="max-height:150px; overflow-y:auto; border:1px solid #ccc;">
+                                                    <pre style="white-space: pre-wrap; margin:0;">{{ $issue.SqlStatement }}</pre>
+                                                </div>
+                                                {{ else }}
+                                                <!-- display N/A if Sql Statement not present -->
+                                                N/A
+                                                {{ end }}
+                                            </td>
+                                        </tr>
+
+                                        <tr>
+                                            <th>Docs Link</th>
+                                            <td>
+                                                {{ if $issue.DocsLink }}
+                                                <a href="{{ $issue.DocsLink }}" target="_blank" title="{{ $issue.DocsLink }}">Documentation</a>
+                                                {{ else }}
+                                                <!-- display N/A if docs link not present -->
+                                                N/A
+                                                {{ end }}
+                                            </td>
+                                        </tr>
+
+                                        <!-- Only show if there is a supported version -->
+                                        {{ $verStr := getSupportedVersionString $issue.MinimumVersionFixedIn }}
+                                        {{ if $verStr }}
+                                        <tr>
+                                            <th>Supported In (versions)</th>
+                                            <td>
+                                                {{ $verStr }}
+                                            </td>
+                                        </tr>
+                                        {{ end }}
+
+                                        <tr>
+                                            <th>Description</th>
+                                            <td>
+                                                {{ if $issue.Description }}
+                                                <div style="max-height:150px; overflow-y:auto; border:1px solid #ccc;">
+                                                    <pre style="white-space: pre-wrap; margin:0;">{{ $issue.Description }}</pre>
+                                                </div>
+                                                {{ else }}
+                                                <!-- display N/A if description not present -->
+                                                    N/A
+                                                {{ end }}
+                                            </td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </td>
+                        </tr>
+                    </tbody>
                 {{ end }}
-            </table>
+            </tbody>
+        </table>
         {{ else }}
-            <p>No unsupported PL/pgSQL objects found in the source database for target YugabyteDB.</p>
+        <p>No issues were found in the assessment.</p>
         {{ end }}
 
-        {{ if .MigrationCaveats}}
-            {{ $hasMigrationCaveats := false }}
-            <h2>Migration caveats</h2>
-            {{range .MigrationCaveats}}
-                {{if .Objects}} <!-- Check if Objects is not empty -->
-                    {{ $hasMigrationCaveats = true }}
-                    {{if .DisplayDDL }} <!-- for these feature we are displaying the DDLs-->
-                        <h4>{{.FeatureName}}</h4>
-                        {{ $supporterVerStr := getSupportedVersionString .MinimumVersionsFixedIn }}
-                        {{ if $supporterVerStr }}
-                            <p>Supported in Versions: {{ $supporterVerStr }} </p>
-                        {{ end }}
-                        <p>{{.FeatureDescription}}</p>
-                        <div class="scrollable-div">
-                            <ul>
-                                {{range .Objects}}
-                                    <li class='list_item'>{{.SqlStatement}}</li>
-                                {{end}}
-                            </ul>
-                        </div>
-                    {{else}}
-                        <h4>{{.FeatureName}}</h4>
-                        {{ $supporterVerStr := getSupportedVersionString .MinimumVersionsFixedIn }}
-                        {{ if $supporterVerStr }}
-                            <p>Supported in Versions: {{ $supporterVerStr }} </p>
-                        {{ end }}
-                        <p>{{.FeatureDescription}}</p>
-                        <div class="scrollable-div">
-                            <ul>
-                                {{range .Objects}}
-                                    <li class='list_item'>{{.ObjectName}}</li>
-                                {{end}}
-                            </ul>
-                        </div>
-                    {{end}}
-                    {{if .DocsLink}}
-                        <p id="refer-p"><a href="{{.DocsLink}}" target="_blank">Details</a></p>
-                    {{end}} 
-                {{end}}
-            {{end}}
-            {{if not $hasMigrationCaveats}} <!-- Check if no migration caveats were found -->
-                <p>No migration caveats were found in the schema.</p>
-            {{end}}
-        {{end}}
-
-
         {{if .Notes}}
             <br>
             <hr>
diff --git a/yb-voyager/src/query/queryissue/issues_ddl.go b/yb-voyager/src/query/queryissue/issues_ddl.go
index 6f3da748cd..d85c18ee3f 100644
--- a/yb-voyager/src/query/queryissue/issues_ddl.go
+++ b/yb-voyager/src/query/queryissue/issues_ddl.go
@@ -26,12 +26,13 @@ import (
 )
 
 var generatedColumnsIssue = issue.Issue{
-	Type:       STORED_GENERATED_COLUMNS,
-	Name:       "Stored generated columns are not supported.",
-	Impact:     constants.IMPACT_LEVEL_1,
-	GH:         "https://github.com/yugabyte/yugabyte-db/issues/10695",
-	Suggestion: "Using Triggers to update the generated columns is one way to work around this issue, refer docs link for more details.",
-	DocsLink:   "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#generated-always-as-stored-type-column-is-not-supported",
+	Type:        STORED_GENERATED_COLUMNS,
+	Name:        "Stored generated columns are not supported.",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "Stored generated columns are not supported in YugabyteDB.\nGenerated columns can be either VIRTUAL or STORED. YugabyteDB supports VIRTUAL generated columns but does not support STORED generated columns.",
+	GH:          "https://github.com/yugabyte/yugabyte-db/issues/10695",
+	Suggestion:  "Using Triggers to update the generated columns is one way to work around this issue, refer docs link for more details.",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#generated-always-as-stored-type-column-is-not-supported",
 }
 
 func NewGeneratedColumnsIssue(objectType string, objectName string, sqlStatement string, generatedColumns []string) QueryIssue {
@@ -41,12 +42,13 @@ func NewGeneratedColumnsIssue(objectType string, objectName string, sqlStatement
 }
 
 var unloggedTableIssue = issue.Issue{
-	Type:       UNLOGGED_TABLE,
-	Name:       "UNLOGGED tables are not supported yet.",
-	Impact:     constants.IMPACT_LEVEL_1,
-	GH:         "https://github.com/yugabyte/yugabyte-db/issues/1129/",
-	Suggestion: "Remove UNLOGGED keyword to make it work",
-	DocsLink:   "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#unlogged-table-is-not-supported",
+	Type:        UNLOGGED_TABLE,
+	Name:        "UNLOGGED tables are not supported yet.",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "UNLOGGED tables are not supported in YugabyteDB",
+	GH:          "https://github.com/yugabyte/yugabyte-db/issues/1129/",
+	Suggestion:  "Remove UNLOGGED keyword to make it work",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#unlogged-table-is-not-supported",
 	MinimumVersionsFixedIn: map[string]*ybversion.YBVersion{
 		ybversion.SERIES_2024_2: ybversion.V2024_2_0_0,
 	},
@@ -58,11 +60,12 @@ func NewUnloggedTableIssue(objectType string, objectName string, sqlStatement st
 }
 
 var unsupportedIndexMethodIssue = issue.Issue{
-	Type:     UNSUPPORTED_INDEX_METHOD,
-	Name:     "Schema contains %s index which is not supported.",
-	Impact:   constants.IMPACT_LEVEL_1,
-	GH:       "https://github.com/YugaByte/yugabyte-db/issues/1337",
-	DocsLink: "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#gist-brin-and-spgist-index-types-are-not-supported",
+	Type:        UNSUPPORTED_INDEX_METHOD,
+	Name:        "Schema contains %s index which is not supported.",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "The schema contains an index with an access method(gist, spgist, brin) which is not supported in YugabyteDB.",
+	GH:          "https://github.com/YugaByte/yugabyte-db/issues/1337",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#gist-brin-and-spgist-index-types-are-not-supported",
 }
 
 func NewUnsupportedIndexMethodIssue(objectType string, objectName string, sqlStatement string, indexAccessMethod string) QueryIssue {
@@ -72,12 +75,13 @@ func NewUnsupportedIndexMethodIssue(objectType string, objectName string, sqlSta
 }
 
 var storageParameterIssue = issue.Issue{
-	Type:       STORAGE_PARAMETER,
-	Name:       "Storage parameters are not supported yet.",
-	Impact:     constants.IMPACT_LEVEL_1,
-	GH:         "https://github.com/yugabyte/yugabyte-db/issues/23467",
-	Suggestion: "Remove the storage parameters from the DDL",
-	DocsLink:   "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#storage-parameters-on-indexes-or-constraints-in-the-source-postgresql",
+	Type:        STORAGE_PARAMETER,
+	Name:        "Storage parameters are not supported yet.",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "Storage parameters in tables, indexes, and constraints are not yet supported in YugabyteDB",
+	GH:          "https://github.com/yugabyte/yugabyte-db/issues/23467",
+	Suggestion:  "Remove the storage parameters from the DDL",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#storage-parameters-on-indexes-or-constraints-in-the-source-postgresql",
 }
 
 func NewStorageParameterIssue(objectType string, objectName string, sqlStatement string) QueryIssue {
@@ -86,12 +90,13 @@ func NewStorageParameterIssue(objectType string, objectName string, sqlStatement
 }
 
 var setColumnAttributeIssue = issue.Issue{
-	Type:       ALTER_TABLE_SET_COLUMN_ATTRIBUTE,
-	Name:       "ALTER TABLE .. ALTER COLUMN .. SET ( attribute = value )	 not supported yet",
-	Impact:     constants.IMPACT_LEVEL_1,
-	GH:         "https://github.com/yugabyte/yugabyte-db/issues/1124",
-	Suggestion: "Remove it from the exported schema",
-	DocsLink:   "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#unsupported-alter-table-ddl-variants-in-source-schema",
+	Type:        ALTER_TABLE_SET_COLUMN_ATTRIBUTE,
+	Name:        "ALTER TABLE .. ALTER COLUMN .. SET ( attribute = value )	 not supported yet",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "ALTER TABLE .. ALTER COLUMN .. SET ( attribute = value ) is not yet supported in YugabyteDB",
+	GH:          "https://github.com/yugabyte/yugabyte-db/issues/1124",
+	Suggestion:  "Remove it from the exported schema",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#unsupported-alter-table-ddl-variants-in-source-schema",
 }
 
 func NewSetColumnAttributeIssue(objectType string, objectName string, sqlStatement string) QueryIssue {
@@ -100,12 +105,13 @@ func NewSetColumnAttributeIssue(objectType string, objectName string, sqlStateme
 }
 
 var alterTableClusterOnIssue = issue.Issue{
-	Type:       ALTER_TABLE_CLUSTER_ON,
-	Name:       "ALTER TABLE CLUSTER not supported yet.",
-	Impact:     constants.IMPACT_LEVEL_1,
-	GH:         "https://github.com/YugaByte/yugabyte-db/issues/1124",
-	Suggestion: "Remove it from the exported schema.",
-	DocsLink:   "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#unsupported-alter-table-ddl-variants-in-source-schema",
+	Type:        ALTER_TABLE_CLUSTER_ON,
+	Name:        "ALTER TABLE CLUSTER not supported yet.",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "ALTER TABLE CLUSTER is not yet supported in YugabyteDB",
+	GH:          "https://github.com/YugaByte/yugabyte-db/issues/1124",
+	Suggestion:  "Remove it from the exported schema.",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#unsupported-alter-table-ddl-variants-in-source-schema",
 }
 
 func NewClusterONIssue(objectType string, objectName string, sqlStatement string) QueryIssue {
@@ -114,12 +120,13 @@ func NewClusterONIssue(objectType string, objectName string, sqlStatement string
 }
 
 var alterTableDisableRuleIssue = issue.Issue{
-	Type:       ALTER_TABLE_DISABLE_RULE,
-	Name:       "ALTER TABLE name DISABLE RULE not supported yet",
-	Impact:     constants.IMPACT_LEVEL_1,
-	GH:         "https://github.com/yugabyte/yugabyte-db/issues/1124",
-	Suggestion: "Remove this and the rule '%s' from the exported schema to be not enabled on the table.",
-	DocsLink:   "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#unsupported-alter-table-ddl-variants-in-source-schema",
+	Type:        ALTER_TABLE_DISABLE_RULE,
+	Name:        "ALTER TABLE name DISABLE RULE not supported yet",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "ALTER TABLE name DISABLE RULE is not yet supported in YugabyteDB",
+	GH:          "https://github.com/yugabyte/yugabyte-db/issues/1124",
+	Suggestion:  "Remove this and the rule '%s' from the exported schema to be not enabled on the table.",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#unsupported-alter-table-ddl-variants-in-source-schema",
 }
 
 func NewAlterTableDisableRuleIssue(objectType string, objectName string, sqlStatement string, ruleName string) QueryIssue {
@@ -130,12 +137,13 @@ func NewAlterTableDisableRuleIssue(objectType string, objectName string, sqlStat
 }
 
 var exclusionConstraintIssue = issue.Issue{
-	Type:       EXCLUSION_CONSTRAINTS,
-	Name:       "Exclusion constraint is not supported yet",
-	Impact:     constants.IMPACT_LEVEL_1,
-	GH:         "https://github.com/yugabyte/yugabyte-db/issues/3944",
-	Suggestion: "Refer docs link for details on possible workaround",
-	DocsLink:   "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#exclusion-constraints-is-not-supported",
+	Type:        EXCLUSION_CONSTRAINTS,
+	Name:        "Exclusion constraint is not supported yet",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "Exclusion constraints are not yet supported in YugabyteDB",
+	GH:          "https://github.com/yugabyte/yugabyte-db/issues/3944",
+	Suggestion:  "Refer docs link for details on possible workaround",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#exclusion-constraints-is-not-supported",
 }
 
 func NewExclusionConstraintIssue(objectType string, objectName string, sqlStatement string, constraintName string) QueryIssue {
@@ -146,12 +154,13 @@ func NewExclusionConstraintIssue(objectType string, objectName string, sqlStatem
 }
 
 var deferrableConstraintIssue = issue.Issue{
-	Type:       DEFERRABLE_CONSTRAINTS,
-	Name:       "DEFERRABLE constraints not supported yet",
-	Impact:     constants.IMPACT_LEVEL_3,
-	GH:         "https://github.com/yugabyte/yugabyte-db/issues/1709",
-	Suggestion: "Remove these constraints from the exported schema and make the neccessary changes to the application to work on target seamlessly",
-	DocsLink:   "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#deferrable-constraint-on-constraints-other-than-foreign-keys-is-not-supported",
+	Type:        DEFERRABLE_CONSTRAINTS,
+	Name:        "DEFERRABLE constraints not supported yet",
+	Impact:      constants.IMPACT_LEVEL_3,
+	Description: "Deferrable constraints are not yet supported in YugabyteDB",
+	GH:          "https://github.com/yugabyte/yugabyte-db/issues/1709",
+	Suggestion:  "Remove these constraints from the exported schema and make the neccessary changes to the application to work on target seamlessly",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#deferrable-constraint-on-constraints-other-than-foreign-keys-is-not-supported",
 }
 
 func NewDeferrableConstraintIssue(objectType string, objectName string, sqlStatement string, constraintName string) QueryIssue {
@@ -162,11 +171,12 @@ func NewDeferrableConstraintIssue(objectType string, objectName string, sqlState
 }
 
 var multiColumnGinIndexIssue = issue.Issue{
-	Type:     MULTI_COLUMN_GIN_INDEX,
-	Name:     "Schema contains gin index on multi column which is not supported.",
-	Impact:   constants.IMPACT_LEVEL_1,
-	GH:       "https://github.com/yugabyte/yugabyte-db/issues/10652",
-	DocsLink: "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#gin-indexes-on-multiple-columns-are-not-supported",
+	Type:        MULTI_COLUMN_GIN_INDEX,
+	Name:        "Schema contains gin index on multi column which is not supported.",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "GIN indexes on multiple columns are not supported in YugabyteDB",
+	GH:          "https://github.com/yugabyte/yugabyte-db/issues/10652",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#gin-indexes-on-multiple-columns-are-not-supported",
 }
 
 func NewMultiColumnGinIndexIssue(objectType string, objectName string, sqlStatement string) QueryIssue {
@@ -174,11 +184,12 @@ func NewMultiColumnGinIndexIssue(objectType string, objectName string, sqlStatem
 }
 
 var orderedGinIndexIssue = issue.Issue{
-	Type:     ORDERED_GIN_INDEX,
-	Name:     "Schema contains gin index on column with ASC/DESC/HASH Clause which is not supported.",
-	Impact:   constants.IMPACT_LEVEL_1,
-	GH:       "https://github.com/yugabyte/yugabyte-db/issues/10653",
-	DocsLink: "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#issue-in-some-unsupported-cases-of-gin-indexes",
+	Type:        ORDERED_GIN_INDEX,
+	Name:        "Schema contains gin index on column with ASC/DESC/HASH Clause which is not supported.",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "GIN indexes on columns with ASC/DESC/HASH clause are not yet supported in YugabyteDB",
+	GH:          "https://github.com/yugabyte/yugabyte-db/issues/10653",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#issue-in-some-unsupported-cases-of-gin-indexes", // TODO: link is not working
 }
 
 func NewOrderedGinIndexIssue(objectType string, objectName string, sqlStatement string) QueryIssue {
@@ -186,12 +197,13 @@ func NewOrderedGinIndexIssue(objectType string, objectName string, sqlStatement
 }
 
 var policyRoleIssue = issue.Issue{
-	Type:       POLICY_WITH_ROLES,
-	Name:       "Policy require roles to be created.",
-	Impact:     constants.IMPACT_LEVEL_1,
-	Suggestion: "Users/Grants are not migrated during the schema migration. Create the Users manually to make the policies work",
-	GH:         "https://github.com/yugabyte/yb-voyager/issues/1655",
-	DocsLink:   "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#policies-on-users-in-source-require-manual-user-creation",
+	Type:        POLICY_WITH_ROLES,
+	Name:        "Policy require roles to be created.",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "Policies require roles to be created in the target database but the roles are not migrated during schema migration.",
+	Suggestion:  "Users/Grants are not migrated during the schema migration. Create the Users manually to make the policies work",
+	GH:          "https://github.com/yugabyte/yb-voyager/issues/1655",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#policies-on-users-in-source-require-manual-user-creation",
 }
 
 func NewPolicyRoleIssue(objectType string, objectName string, sqlStatement string, roles []string) QueryIssue {
@@ -201,11 +213,12 @@ func NewPolicyRoleIssue(objectType string, objectName string, sqlStatement strin
 }
 
 var constraintTriggerIssue = issue.Issue{
-	Type:     CONSTRAINT_TRIGGER,
-	Name:     "CONSTRAINT TRIGGER not supported yet.",
-	Impact:   constants.IMPACT_LEVEL_1,
-	GH:       "https://github.com/YugaByte/yugabyte-db/issues/1709",
-	DocsLink: "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#constraint-trigger-is-not-supported",
+	Type:        CONSTRAINT_TRIGGER,
+	Name:        "CONSTRAINT TRIGGER not supported yet.",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "CONSTRAINT TRIGGER is not yet supported in YugabyteDB",
+	GH:          "https://github.com/YugaByte/yugabyte-db/issues/1709",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#constraint-trigger-is-not-supported",
 }
 
 func NewConstraintTriggerIssue(objectType string, objectName string, sqlStatement string) QueryIssue {
@@ -214,11 +227,12 @@ func NewConstraintTriggerIssue(objectType string, objectName string, sqlStatemen
 }
 
 var referencingClauseInTriggerIssue = issue.Issue{
-	Type:     REFERENCING_CLAUSE_IN_TRIGGER,
-	Name:     "REFERENCING clause (transition tables) not supported yet.",
-	Impact:   constants.IMPACT_LEVEL_1,
-	GH:       "https://github.com/YugaByte/yugabyte-db/issues/1668",
-	DocsLink: "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#referencing-clause-for-triggers",
+	Type:        REFERENCING_CLAUSE_IN_TRIGGER,
+	Name:        "REFERENCING clause (transition tables) not supported yet.",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "REFERENCING clause (transition tables) is not yet supported in YugabyteDB",
+	GH:          "https://github.com/YugaByte/yugabyte-db/issues/1668",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#referencing-clause-for-triggers",
 }
 
 func NewReferencingClauseTrigIssue(objectType string, objectName string, sqlStatement string) QueryIssue {
@@ -226,12 +240,13 @@ func NewReferencingClauseTrigIssue(objectType string, objectName string, sqlStat
 }
 
 var beforeRowTriggerOnPartitionTableIssue = issue.Issue{
-	Type:       BEFORE_ROW_TRIGGER_ON_PARTITIONED_TABLE,
-	Name:       "Partitioned tables cannot have BEFORE / FOR EACH ROW triggers.",
-	Impact:     constants.IMPACT_LEVEL_1,
-	DocsLink:   "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#before-row-triggers-on-partitioned-tables",
-	GH:         "https://github.com/yugabyte/yugabyte-db/issues/24830",
-	Suggestion: "Create the triggers on individual partitions.",
+	Type:        BEFORE_ROW_TRIGGER_ON_PARTITIONED_TABLE,
+	Name:        "Partitioned tables cannot have BEFORE / FOR EACH ROW triggers.",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "BEFORE ROW triggers on partitioned tables are not yet supported in YugabyteDB",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#before-row-triggers-on-partitioned-tables",
+	GH:          "https://github.com/yugabyte/yugabyte-db/issues/24830",
+	Suggestion:  "Create the triggers on individual partitions.",
 }
 
 func NewBeforeRowOnPartitionTableIssue(objectType string, objectName string, sqlStatement string) QueryIssue {
@@ -239,11 +254,12 @@ func NewBeforeRowOnPartitionTableIssue(objectType string, objectName string, sql
 }
 
 var alterTableAddPKOnPartitionIssue = issue.Issue{
-	Type:     ALTER_TABLE_ADD_PK_ON_PARTITIONED_TABLE,
-	Name:     "Adding primary key to a partitioned table is not supported yet.",
-	Impact:   constants.IMPACT_LEVEL_1,
-	DocsLink: "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#adding-primary-key-to-a-partitioned-table-results-in-an-error",
-	GH:       "https://github.com/yugabyte/yugabyte-db/issues/10074",
+	Type:        ALTER_TABLE_ADD_PK_ON_PARTITIONED_TABLE,
+	Name:        "Adding primary key to a partitioned table is not supported yet.",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "Adding primary key using ALTER TABLE to a partitioned table is not yet supported in YugabyteDB",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#adding-primary-key-to-a-partitioned-table-results-in-an-error",
+	GH:          "https://github.com/yugabyte/yugabyte-db/issues/10074",
 	MinimumVersionsFixedIn: map[string]*ybversion.YBVersion{
 		ybversion.SERIES_2024_1: ybversion.V2024_1_0_0,
 		ybversion.SERIES_2024_2: ybversion.V2024_2_0_0,
@@ -257,12 +273,13 @@ func NewAlterTableAddPKOnPartiionIssue(objectType string, objectName string, sql
 }
 
 var expressionPartitionIssue = issue.Issue{
-	Type:       EXPRESSION_PARTITION_WITH_PK_UK,
-	Name:       "Issue with Partition using Expression on a table which cannot contain Primary Key / Unique Key on any column",
-	Impact:     constants.IMPACT_LEVEL_1,
-	Suggestion: "Remove the Constriant from the table definition",
-	GH:         "https://github.com/yugabyte/yb-voyager/issues/698",
-	DocsLink:   "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/mysql/#tables-partitioned-with-expressions-cannot-contain-primary-unique-keys",
+	Type:        EXPRESSION_PARTITION_WITH_PK_UK,
+	Name:        "Issue with Partition using Expression on a table which cannot contain Primary Key / Unique Key on any column",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "Tables partitioned using expressions cannot contain primary or unique keys in YugabyteDB",
+	Suggestion:  "Remove the Constriant from the table definition",
+	GH:          "https://github.com/yugabyte/yb-voyager/issues/698",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/mysql/#tables-partitioned-with-expressions-cannot-contain-primary-unique-keys",
 }
 
 func NewExpressionPartitionIssue(objectType string, objectName string, sqlStatement string) QueryIssue {
@@ -270,12 +287,13 @@ func NewExpressionPartitionIssue(objectType string, objectName string, sqlStatem
 }
 
 var multiColumnListPartition = issue.Issue{
-	Type:       MULTI_COLUMN_LIST_PARTITION,
-	Name:       `cannot use "list" partition strategy with more than one column`,
-	Impact:     constants.IMPACT_LEVEL_1,
-	Suggestion: "Make it a single column partition by list or choose other supported Partitioning methods",
-	GH:         "https://github.com/yugabyte/yb-voyager/issues/699",
-	DocsLink:   "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/mysql/#multi-column-partition-by-list-is-not-supported",
+	Type:        MULTI_COLUMN_LIST_PARTITION,
+	Name:        `cannot use "list" partition strategy with more than one column`,
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "Multi-column partition by list is not supported in YugabyteDB",
+	Suggestion:  "Make it a single column partition by list or choose other supported Partitioning methods",
+	GH:          "https://github.com/yugabyte/yb-voyager/issues/699",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/mysql/#multi-column-partition-by-list-is-not-supported",
 }
 
 func NewMultiColumnListPartition(objectType string, objectName string, sqlStatement string) QueryIssue {
@@ -283,12 +301,13 @@ func NewMultiColumnListPartition(objectType string, objectName string, sqlStatem
 }
 
 var insufficientColumnsInPKForPartition = issue.Issue{
-	Type:       INSUFFICIENT_COLUMNS_IN_PK_FOR_PARTITION,
-	Name:       "insufficient columns in the PRIMARY KEY constraint definition in CREATE TABLE",
-	Impact:     constants.IMPACT_LEVEL_1,
-	Suggestion: "Add all Partition columns to Primary Key",
-	GH:         "https://github.com/yugabyte/yb-voyager/issues/578",
-	DocsLink:   "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/oracle/#partition-key-column-not-part-of-primary-key-columns",
+	Type:        INSUFFICIENT_COLUMNS_IN_PK_FOR_PARTITION,
+	Name:        "insufficient columns in the PRIMARY KEY constraint definition in CREATE TABLE",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "Partition key column not part of Primary Key columns",
+	Suggestion:  "Add all Partition columns to Primary Key",
+	GH:          "https://github.com/yugabyte/yb-voyager/issues/578",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/oracle/#partition-key-column-not-part-of-primary-key-columns",
 }
 
 func NewInsufficientColumnInPKForPartition(objectType string, objectName string, sqlStatement string, partitionColumnsNotInPK []string) QueryIssue {
@@ -298,12 +317,13 @@ func NewInsufficientColumnInPKForPartition(objectType string, objectName string,
 }
 
 var xmlDatatypeIssue = issue.Issue{
-	Type:       XML_DATATYPE,
-	Name:       "Unsupported datatype - xml",
-	Impact:     constants.IMPACT_LEVEL_3,
-	Suggestion: "Data ingestion is not supported for this type in YugabyteDB so handle this type in different way. Refer link for more details.",
-	GH:         "https://github.com/yugabyte/yugabyte-db/issues/1043",
-	DocsLink:   "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#data-ingestion-on-xml-data-type-is-not-supported",
+	Type:        XML_DATATYPE,
+	Name:        "Unsupported datatype - xml",
+	Impact:      constants.IMPACT_LEVEL_3,
+	Description: "XML datatype is not yet supported in YugabyteDB",
+	Suggestion:  "Data ingestion is not supported for this type in YugabyteDB so handle this type in different way. Refer link for more details.",
+	GH:          "https://github.com/yugabyte/yugabyte-db/issues/1043",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#data-ingestion-on-xml-data-type-is-not-supported",
 }
 
 func NewXMLDatatypeIssue(objectType string, objectName string, sqlStatement string, colName string) QueryIssue {
@@ -313,12 +333,13 @@ func NewXMLDatatypeIssue(objectType string, objectName string, sqlStatement stri
 }
 
 var xidDatatypeIssue = issue.Issue{
-	Type:       XID_DATATYPE,
-	Name:       "Unsupported datatype - xid",
-	Impact:     constants.IMPACT_LEVEL_3,
-	Suggestion: "Functions for this type e.g. txid_current are not supported in YugabyteDB yet",
-	GH:         "https://github.com/yugabyte/yugabyte-db/issues/15638",
-	DocsLink:   "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#xid-functions-is-not-supported",
+	Type:        XID_DATATYPE,
+	Name:        "Unsupported datatype - xid",
+	Impact:      constants.IMPACT_LEVEL_3,
+	Description: "XID datatype is not yet supported in YugabyteDB",
+	Suggestion:  "Functions for this type e.g. txid_current are not supported in YugabyteDB yet",
+	GH:          "https://github.com/yugabyte/yugabyte-db/issues/15638",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#xid-functions-is-not-supported",
 }
 
 func NewXIDDatatypeIssue(objectType string, objectName string, sqlStatement string, colName string) QueryIssue {
@@ -328,11 +349,12 @@ func NewXIDDatatypeIssue(objectType string, objectName string, sqlStatement stri
 }
 
 var postgisDatatypeIssue = issue.Issue{
-	Type:     POSTGIS_DATATYPES,
-	Name:     "Unsupported datatype",
-	Impact:   constants.IMPACT_LEVEL_1,
-	GH:       "https://github.com/yugabyte/yugabyte-db/issues/11323",
-	DocsLink: "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#unsupported-datatypes-by-yugabytedb",
+	Type:        POSTGIS_DATATYPES,
+	Name:        "Unsupported datatype",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "PostGIS datatypes are not yet supported in YugabyteDB",
+	GH:          "https://github.com/yugabyte/yugabyte-db/issues/11323",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#unsupported-datatypes-by-yugabytedb",
 }
 
 func NewPostGisDatatypeIssue(objectType string, objectName string, sqlStatement string, typeName string, colName string) QueryIssue {
@@ -342,54 +364,61 @@ func NewPostGisDatatypeIssue(objectType string, objectName string, sqlStatement
 }
 
 var unsupportedDatatypesIssue = issue.Issue{
-	Type:     UNSUPPORTED_DATATYPES,
-	Name:     "Unsupported datatype",
-	Impact:   constants.IMPACT_LEVEL_1,
-	GH:       "https://github.com/yugabyte/yb-voyager/issues/1731",
-	DocsLink: "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#unsupported-datatypes-by-yugabytedb",
+	Type:        UNSUPPORTED_DATATYPES,
+	Name:        "Unsupported datatype",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "%s datatype is not yet supported in YugabyteDB",
+	GH:          "https://github.com/yugabyte/yb-voyager/issues/1731",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#unsupported-datatypes-by-yugabytedb",
 }
 
 func NewUnsupportedDatatypesIssue(objectType string, objectName string, sqlStatement string, typeName string, colName string) QueryIssue {
 	issue := unsupportedDatatypesIssue
 	issue.Name = fmt.Sprintf("%s - %s on column - %s", issue.Name, typeName, colName)
+	issue.Description = fmt.Sprintf(issue.Description, typeName)
 	return newQueryIssue(issue, objectType, objectName, sqlStatement, map[string]interface{}{})
 }
 
 var unsupportedDatatypesForLiveMigrationIssue = issue.Issue{
-	Type:     UNSUPPORTED_DATATYPES_LIVE_MIGRATION,
-	Name:     "Unsupported datatype for Live migration",
-	Impact:   constants.IMPACT_LEVEL_1,
-	GH:       "https://github.com/yugabyte/yb-voyager/issues/1731",
-	DocsLink: "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#unsupported-datatypes-by-voyager-during-live-migration",
+	Type:        UNSUPPORTED_DATATYPES_LIVE_MIGRATION,
+	Name:        "Unsupported datatype for Live migration",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "%s datatype is not yet supported by voyager for Live Migration",
+	GH:          "https://github.com/yugabyte/yb-voyager/issues/1731",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#unsupported-datatypes-by-voyager-during-live-migration",
 }
 
 func NewUnsupportedDatatypesForLMIssue(objectType string, objectName string, sqlStatement string, typeName string, colName string) QueryIssue {
 	issue := unsupportedDatatypesForLiveMigrationIssue
 	issue.Name = fmt.Sprintf("%s - %s on column - %s", issue.Name, typeName, colName)
+	issue.Description = fmt.Sprintf(issue.Description, typeName)
 	return newQueryIssue(issue, objectType, objectName, sqlStatement, map[string]interface{}{})
 }
 
 var unsupportedDatatypesForLiveMigrationWithFFOrFBIssue = issue.Issue{
-	Type:     UNSUPPORTED_DATATYPES_LIVE_MIGRATION_WITH_FF_FB,
-	Name:     "Unsupported datatype for Live migration with fall-forward/fallback",
-	Impact:   constants.IMPACT_LEVEL_1,
-	GH:       "https://github.com/yugabyte/yb-voyager/issues/1731",
-	DocsLink: "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#unsupported-datatypes-by-voyager-during-live-migration",
+	Type:        UNSUPPORTED_DATATYPES_LIVE_MIGRATION_WITH_FF_FB,
+	Name:        "Unsupported datatype for Live migration with fall-forward/fallback",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "%s datatype is not yet supported by voyager for Live Migration with fall-forward/fallback",
+	GH:          "https://github.com/yugabyte/yb-voyager/issues/1731",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#unsupported-datatypes-by-voyager-during-live-migration",
 }
 
 func NewUnsupportedDatatypesForLMWithFFOrFBIssue(objectType string, objectName string, sqlStatement string, typeName string, colName string) QueryIssue {
 	issue := unsupportedDatatypesForLiveMigrationWithFFOrFBIssue
 	issue.Name = fmt.Sprintf("%s - %s on column - %s", issue.Name, typeName, colName)
+	issue.Description = fmt.Sprintf(issue.Description, typeName)
 	return newQueryIssue(issue, objectType, objectName, sqlStatement, map[string]interface{}{})
 }
 
 var primaryOrUniqueOnUnsupportedIndexTypesIssue = issue.Issue{
-	Type:       PK_UK_ON_COMPLEX_DATATYPE,
-	Name:       "Primary key and Unique constraint on column '%s' not yet supported",
-	Impact:     constants.IMPACT_LEVEL_1,
-	GH:         "https://github.com/yugabyte/yugabyte-db/issues/25003",
-	Suggestion: "Refer to the docs link for the workaround",
-	DocsLink:   "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#indexes-on-some-complex-data-types-are-not-supported", //Keeping it similar for now, will see if we need to a separate issue on docs,
+	Type:        PK_UK_ON_COMPLEX_DATATYPE,
+	Name:        "Primary key and Unique constraint on column '%s' not yet supported",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "Primary key and Unique constraints on columns with complex data types are not yet supported in YugabyteDB",
+	GH:          "https://github.com/yugabyte/yugabyte-db/issues/25003",
+	Suggestion:  "Refer to the docs link for the workaround",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#indexes-on-some-complex-data-types-are-not-supported", //Keeping it similar for now, will see if we need to a separate issue on docs,
 }
 
 func NewPrimaryOrUniqueConsOnUnsupportedIndexTypesIssue(objectType string, objectName string, sqlStatement string, typeName string, constraintName string) QueryIssue {
@@ -402,12 +431,13 @@ func NewPrimaryOrUniqueConsOnUnsupportedIndexTypesIssue(objectType string, objec
 }
 
 var indexOnComplexDatatypesIssue = issue.Issue{
-	Type:       INDEX_ON_COMPLEX_DATATYPE,
-	Name:       "INDEX on column '%s' not yet supported",
-	Impact:     constants.IMPACT_LEVEL_1,
-	GH:         "https://github.com/yugabyte/yugabyte-db/issues/25003",
-	Suggestion: "Refer to the docs link for the workaround",
-	DocsLink:   "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#indexes-on-some-complex-data-types-are-not-supported",
+	Type:        INDEX_ON_COMPLEX_DATATYPE,
+	Name:        "INDEX on column '%s' not yet supported",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "Indexes on columns with complex data types are not yet supported in YugabyteDB",
+	GH:          "https://github.com/yugabyte/yugabyte-db/issues/25003",
+	Suggestion:  "Refer to the docs link for the workaround",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#indexes-on-some-complex-data-types-are-not-supported",
 }
 
 func NewIndexOnComplexDatatypesIssue(objectType string, objectName string, sqlStatement string, typeName string) QueryIssue {
@@ -417,12 +447,13 @@ func NewIndexOnComplexDatatypesIssue(objectType string, objectName string, sqlSt
 }
 
 var foreignTableIssue = issue.Issue{
-	Type:       FOREIGN_TABLE,
-	Name:       "Foreign tables require manual intervention.",
-	Impact:     constants.IMPACT_LEVEL_1,
-	GH:         "https://github.com/yugabyte/yb-voyager/issues/1627",
-	Suggestion: "SERVER '%s', and USER MAPPING should be created manually on the target to create and use the foreign table",
-	DocsLink:   "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#foreign-table-in-the-source-database-requires-server-and-user-mapping",
+	Type:        FOREIGN_TABLE,
+	Name:        "Foreign tables require manual intervention.",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "Foreign table creation fails as SERVER and USER MAPPING objects are not exported by Voyager",
+	GH:          "https://github.com/yugabyte/yb-voyager/issues/1627",
+	Suggestion:  "SERVER '%s', and USER MAPPING should be created manually on the target to create and use the foreign table",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#foreign-table-in-the-source-database-requires-server-and-user-mapping",
 }
 
 func NewForeignTableIssue(objectType string, objectName string, sqlStatement string, serverName string) QueryIssue {
@@ -432,11 +463,12 @@ func NewForeignTableIssue(objectType string, objectName string, sqlStatement str
 }
 
 var inheritanceIssue = issue.Issue{
-	Type:     INHERITANCE,
-	Name:     "TABLE INHERITANCE not supported in YugabyteDB",
-	Impact:   constants.IMPACT_LEVEL_3,
-	GH:       "https://github.com/YugaByte/yugabyte-db/issues/1129",
-	DocsLink: "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#table-inheritance-is-not-supported",
+	Type:        INHERITANCE,
+	Name:        "TABLE INHERITANCE not supported in YugabyteDB",
+	Impact:      constants.IMPACT_LEVEL_3,
+	Description: "Table inheritance is not yet supported in YugabyteDB",
+	GH:          "https://github.com/YugaByte/yugabyte-db/issues/1129",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#table-inheritance-is-not-supported",
 }
 
 func NewInheritanceIssue(objectType string, objectName string, sqlStatement string) QueryIssue {
@@ -447,7 +479,7 @@ var percentTypeSyntax = issue.Issue{
 	Type:        REFERENCED_TYPE_DECLARATION,
 	Name:        "Referenced type declaration of variables",
 	Impact:      constants.IMPACT_LEVEL_1,
-	Description: "",
+	Description: "Referencing the type of a column instead of the actual type name is not supported in YugabyteDB",
 	Suggestion:  "Fix the syntax to include the actual type name instead of referencing the type of a column",
 	GH:          "https://github.com/yugabyte/yugabyte-db/issues/23619",
 	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#type-syntax-is-not-supported",
@@ -458,12 +490,13 @@ func NewPercentTypeSyntaxIssue(objectType string, objectName string, sqlStatemen
 }
 
 var loDatatypeIssue = issue.Issue{
-	Type:       LARGE_OBJECT_DATATYPE,
-	Name:       "Unsupported datatype - lo",
-	Impact:     constants.IMPACT_LEVEL_1,
-	Suggestion: "Large objects are not yet supported in YugabyteDB, no workaround available currently",
-	GH:         "https://github.com/yugabyte/yugabyte-db/issues/25318",
-	DocsLink:   "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#large-objects-and-its-functions-are-currently-not-supported", // TODO
+	Type:        LARGE_OBJECT_DATATYPE,
+	Name:        "Unsupported datatype - lo",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "Large objects are not yet supported in YugabyteDB",
+	Suggestion:  "Large objects are not yet supported in YugabyteDB, no workaround available currently",
+	GH:          "https://github.com/yugabyte/yugabyte-db/issues/25318",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#large-objects-and-its-functions-are-currently-not-supported", // TODO
 }
 
 func NewLODatatypeIssue(objectType string, objectName string, SqlStatement string, colName string) QueryIssue {
@@ -473,12 +506,13 @@ func NewLODatatypeIssue(objectType string, objectName string, SqlStatement strin
 }
 
 var multiRangeDatatypeIssue = issue.Issue{
-	Type:       MULTI_RANGE_DATATYPE,
-	Name:       "Unsupported datatype",
-	Impact:     constants.IMPACT_LEVEL_1,
-	Suggestion: "Multirange data type is not yet supported in YugabyteDB, no workaround available currently",
-	GH:         "https://github.com/yugabyte/yugabyte-db/issues/25575", 
-	DocsLink:   "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#postgresql-12-and-later-features", 
+	Type:        MULTI_RANGE_DATATYPE,
+	Name:        "Unsupported datatype",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "Multirange data type is not yet supported in YugabyteDB",
+	Suggestion:  "Multirange data type is not yet supported in YugabyteDB, no workaround available currently",
+	GH:          "https://github.com/yugabyte/yugabyte-db/issues/25575",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#postgresql-12-and-later-features",
 }
 
 func NewMultiRangeDatatypeIssue(objectType string, objectName string, sqlStatement string, typeName string, colName string) QueryIssue {
@@ -488,12 +522,13 @@ func NewMultiRangeDatatypeIssue(objectType string, objectName string, sqlStateme
 }
 
 var securityInvokerViewIssue = issue.Issue{
-	Type:       SECURITY_INVOKER_VIEWS,
-	Name:       "Security Invoker Views not supported yet",
-	Impact:     constants.IMPACT_LEVEL_1,
-	Suggestion: "Security Invoker Views are not yet supported in YugabyteDB, no workaround available currently",
-	GH:         "https://github.com/yugabyte/yugabyte-db/issues/25575", 
-	DocsLink:   "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#postgresql-12-and-later-features", 
+	Type:        SECURITY_INVOKER_VIEWS,
+	Name:        "Security Invoker Views not supported yet",
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "Security Invoker Views are not yet supported in YugabyteDB",
+	Suggestion:  "Security Invoker Views are not yet supported in YugabyteDB, no workaround available currently",
+	GH:          "https://github.com/yugabyte/yugabyte-db/issues/25575",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#postgresql-12-and-later-features",
 }
 
 func NewSecurityInvokerViewIssue(objectType string, objectName string, SqlStatement string) QueryIssue {
@@ -501,12 +536,13 @@ func NewSecurityInvokerViewIssue(objectType string, objectName string, SqlStatem
 }
 
 var deterministicOptionCollationIssue = issue.Issue{
-	Type:       DETERMINISTIC_OPTION_WITH_COLLATION,
-	Name:       DETERMINISTIC_OPTION_WITH_COLLATION_NAME,
-	Impact:     constants.IMPACT_LEVEL_1,
-	Suggestion: "This feature is not supported in YugabyteDB yet",
-	GH:         "https://github.com/yugabyte/yugabyte-db/issues/25575", 
-	DocsLink:   "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#postgresql-12-and-later-features", 
+	Type:        DETERMINISTIC_OPTION_WITH_COLLATION,
+	Name:        DETERMINISTIC_OPTION_WITH_COLLATION_NAME,
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "Deterministic option with collation is not supported in YugabyteDB",
+	Suggestion:  "This feature is not supported in YugabyteDB yet",
+	GH:          "https://github.com/yugabyte/yugabyte-db/issues/25575",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#postgresql-12-and-later-features",
 }
 
 func NewDeterministicOptionCollationIssue(objectType string, objectName string, SqlStatement string) QueryIssue {
@@ -514,12 +550,13 @@ func NewDeterministicOptionCollationIssue(objectType string, objectName string,
 }
 
 var foreignKeyReferencesPartitionedTableIssue = issue.Issue{
-	Type:       FOREIGN_KEY_REFERENCES_PARTITIONED_TABLE,
-	Name:       FOREIGN_KEY_REFERENCES_PARTITIONED_TABLE_NAME,
-	Impact:     constants.IMPACT_LEVEL_1,
-	Suggestion: "No workaround available ",
-	GH:         "https://github.com/yugabyte/yugabyte-db/issues/25575", 
-	DocsLink:   "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#postgresql-12-and-later-features", 
+	Type:        FOREIGN_KEY_REFERENCES_PARTITIONED_TABLE,
+	Name:        FOREIGN_KEY_REFERENCES_PARTITIONED_TABLE_NAME,
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "Foreign key references to partitioned tables are not yet supported in YugabyteDB",
+	Suggestion:  "No workaround available ",
+	GH:          "https://github.com/yugabyte/yugabyte-db/issues/25575",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#postgresql-12-and-later-features",
 }
 
 func NewForeignKeyReferencesPartitionedTableIssue(objectType string, objectName string, SqlStatement string, constraintName string) QueryIssue {
@@ -530,12 +567,13 @@ func NewForeignKeyReferencesPartitionedTableIssue(objectType string, objectName
 }
 
 var uniqueNullsNotDistinctIssue = issue.Issue{
-	Type:       UNIQUE_NULLS_NOT_DISTINCT,
-	Name:       UNIQUE_NULLS_NOT_DISTINCT_NAME,
-	Impact:     constants.IMPACT_LEVEL_1,
-	Suggestion: "",
-	GH:         "https://github.com/yugabyte/yugabyte-db/issues/25575",
-	DocsLink:   "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#postgresql-12-and-later-features",
+	Type:        UNIQUE_NULLS_NOT_DISTINCT,
+	Name:        UNIQUE_NULLS_NOT_DISTINCT_NAME,
+	Impact:      constants.IMPACT_LEVEL_1,
+	Description: "Unique constraint on columns with NULL values is not yet supported in YugabyteDB",
+	Suggestion:  "",
+	GH:          "https://github.com/yugabyte/yugabyte-db/issues/25575",
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#postgresql-12-and-later-features",
 }
 
 func NewUniqueNullsNotDistinctIssue(objectType string, objectName string, sqlStatement string) QueryIssue {
diff --git a/yb-voyager/src/query/queryissue/issues_dml.go b/yb-voyager/src/query/queryissue/issues_dml.go
index 8bc2c356cc..eca78e7dff 100644
--- a/yb-voyager/src/query/queryissue/issues_dml.go
+++ b/yb-voyager/src/query/queryissue/issues_dml.go
@@ -27,7 +27,7 @@ var advisoryLocksIssue = issue.Issue{
 	Type:        ADVISORY_LOCKS,
 	Name:        "Advisory Locks",
 	Impact:      constants.IMPACT_LEVEL_2,
-	Description: "",
+	Description: "Advisory locks are not yet implemented in YugabyteDB",
 	Suggestion:  "",
 	GH:          "https://github.com/yugabyte/yugabyte-db/issues/3642",
 	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#advisory-locks-is-not-yet-implemented",
@@ -41,7 +41,7 @@ var systemColumnsIssue = issue.Issue{
 	Type:        SYSTEM_COLUMNS,
 	Name:        "System Columns",
 	Impact:      constants.IMPACT_LEVEL_2,
-	Description: "",
+	Description: "System columns are not yet supported in YugabyteDB",
 	Suggestion:  "",
 	GH:          "https://github.com/yugabyte/yugabyte-db/issues/24843",
 	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#system-columns-is-not-yet-supported",
@@ -55,7 +55,7 @@ var xmlFunctionsIssue = issue.Issue{
 	Type:        XML_FUNCTIONS,
 	Name:        "XML Functions",
 	Impact:      constants.IMPACT_LEVEL_2,
-	Description: "",
+	Description: "XML functions are not yet supported in YugabyteDB",
 	Suggestion:  "",
 	GH:          "https://github.com/yugabyte/yugabyte-db/issues/1043",
 	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#xml-functions-is-not-yet-supported",
@@ -69,7 +69,7 @@ var regexFunctionsIssue = issue.Issue{
 	Type:        REGEX_FUNCTIONS,
 	Name:        "Regex Functions",
 	Impact:      constants.IMPACT_LEVEL_2,
-	Description: "",
+	Description: "Regex functions are not yet supported in YugabyteDB",
 	Suggestion:  "",
 	GH:          "https://github.com/yugabyte/yugabyte-db/issues/25575",
 	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#postgresql-12-and-later-features",
@@ -83,10 +83,10 @@ var aggregateFunctionIssue = issue.Issue{
 	Type:        AGGREGATE_FUNCTION,
 	Name:        AGGREGATION_FUNCTIONS_NAME,
 	Impact:      constants.IMPACT_LEVEL_2,
-	Description: "any_value, range_agg and range_intersect_agg functions not supported yet in YugabyteDB",
+	Description: "any_value, range_agg and range_intersect_agg functions are not supported yet in YugabyteDB",
 	Suggestion:  "",
 	GH:          "https://github.com/yugabyte/yugabyte-db/issues/25575",
-	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#postgresql-12-and-later-features", 
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#postgresql-12-and-later-features",
 }
 
 func NewAggregationFunctionIssue(objectType string, objectName string, sqlStatement string, funcNames []string) QueryIssue {
@@ -101,7 +101,7 @@ var jsonConstructorFunctionsIssue = issue.Issue{
 	Type:        JSON_CONSTRUCTOR_FUNCTION,
 	Name:        JSON_CONSTRUCTOR_FUNCTION_NAME,
 	Impact:      constants.IMPACT_LEVEL_2,
-	Description: "Postgresql 17 features not supported yet in YugabyteDB",
+	Description: "JSON constructor functions from PostgreSQL 17 are not yet supported in YugabyteDB",
 	Suggestion:  "",
 	GH:          "https://github.com/yugabyte/yugabyte-db/issues/25575",
 	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#postgresql-12-and-later-features",
@@ -119,10 +119,10 @@ var jsonQueryFunctionIssue = issue.Issue{
 	Type:        JSON_QUERY_FUNCTION,
 	Name:        JSON_QUERY_FUNCTIONS_NAME,
 	Impact:      constants.IMPACT_LEVEL_2,
-	Description: "Postgresql 17 features not supported yet in YugabyteDB",
+	Description: "JSON query functions from PostgreSQL 17 are not yet supported in YugabyteDB",
 	Suggestion:  "",
 	GH:          "https://github.com/yugabyte/yugabyte-db/issues/25575",
-	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#postgresql-12-and-later-features", 
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#postgresql-12-and-later-features",
 }
 
 func NewJsonQueryFunctionIssue(objectType string, objectName string, sqlStatement string, funcNames []string) QueryIssue {
@@ -138,9 +138,8 @@ var loFunctionsIssue = issue.Issue{
 	Name:        LARGE_OBJECT_FUNCTIONS_NAME,
 	Impact:      constants.IMPACT_LEVEL_2,
 	Description: "Large Objects functions are not supported in YugabyteDB",
-	Suggestion:  "Large objects functions are not yet supported in YugabyteDB, no workaround available right now",
 	GH:          "https://github.com/yugabyte/yugabyte-db/issues/25318",
-	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#large-objects-and-its-functions-are-currently-not-supported", 
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#large-objects-and-its-functions-are-currently-not-supported",
 }
 
 func NewLOFuntionsIssue(objectType string, objectName string, sqlStatement string, funcNames []string) QueryIssue {
@@ -155,10 +154,10 @@ var jsonbSubscriptingIssue = issue.Issue{
 	Type:        JSONB_SUBSCRIPTING,
 	Name:        JSONB_SUBSCRIPTING_NAME,
 	Impact:      constants.IMPACT_LEVEL_2,
-	Description: "Jsonb subscripting is not supported in YugabyteDB yet",
+	Description: "Jsonb subscripting is not yet supported in YugabyteDB",
 	Suggestion:  "Use Arrow operators (-> / ->>) to access the jsonb fields.",
 	GH:          "https://github.com/yugabyte/yugabyte-db/issues/25575",
-	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#jsonb-subscripting", 
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#jsonb-subscripting",
 }
 
 func NewJsonbSubscriptingIssue(objectType string, objectName string, sqlStatement string) QueryIssue {
@@ -169,10 +168,10 @@ var jsonPredicateIssue = issue.Issue{
 	Type:        JSON_TYPE_PREDICATE,
 	Name:        JSON_TYPE_PREDICATE_NAME,
 	Impact:      constants.IMPACT_LEVEL_2,
-	Description: "IS JSON predicate expressions not supported yet in YugabyteDB",
+	Description: "IS JSON predicate expressions are not yet supported in YugabyteDB",
 	Suggestion:  "",
 	GH:          "https://github.com/yugabyte/yugabyte-db/issues/25575",
-	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#postgresql-12-and-later-features", 
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#postgresql-12-and-later-features",
 }
 
 func NewJsonPredicateIssue(objectType string, objectName string, sqlStatement string) QueryIssue {
@@ -183,7 +182,7 @@ var copyFromWhereIssue = issue.Issue{
 	Type:        COPY_FROM_WHERE,
 	Name:        "COPY FROM ... WHERE",
 	Impact:      constants.IMPACT_LEVEL_2,
-	Description: "",
+	Description: "COPY FROM ... WHERE is not yet supported in YugabyteDB",
 	Suggestion:  "",
 	GH:          "https://github.com/yugabyte/yugabyte-db/issues/25575",
 	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#postgresql-12-and-later-features",
@@ -197,7 +196,7 @@ var copyOnErrorIssue = issue.Issue{
 	Type:        COPY_ON_ERROR,
 	Name:        "COPY ... ON_ERROR",
 	Impact:      constants.IMPACT_LEVEL_2,
-	Description: "",
+	Description: "COPY ... ON_ERROR is not yet supported in YugabyteDB",
 	Suggestion:  "",
 	GH:          "https://github.com/yugabyte/yugabyte-db/issues/25575",
 	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#postgresql-12-and-later-features",
@@ -211,10 +210,10 @@ var fetchWithTiesIssue = issue.Issue{
 	Type:        FETCH_WITH_TIES,
 	Name:        "FETCH .. WITH TIES",
 	Impact:      constants.IMPACT_LEVEL_2,
-	Description: "FETCH .. WITH TIES is not supported in YugabyteDB",
+	Description: "FETCH .. WITH TIES is not yet supported in YugabyteDB",
 	Suggestion:  "No workaround available right now",
 	GH:          "https://github.com/yugabyte/yugabyte-db/issues/25575",
-	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#postgresql-12-and-later-features", 
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#postgresql-12-and-later-features",
 }
 
 func NewFetchWithTiesIssue(objectType string, objectName string, sqlStatement string) QueryIssue {
@@ -225,10 +224,10 @@ var mergeStatementIssue = issue.Issue{
 	Type:        MERGE_STATEMENT,
 	Name:        "Merge Statement",
 	Impact:      constants.IMPACT_LEVEL_2,
-	Description: "This statement is not supported in YugabyteDB yet",
+	Description: "MERGE statement is not yet supported in YugabyteDB",
 	Suggestion:  "Use PL/pgSQL to write the logic to get this functionality",
 	GH:          "https://github.com/yugabyte/yugabyte-db/issues/25574",
-	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#merge-command", 
+	DocsLink:    "https://docs.yugabyte.com/preview/yugabyte-voyager/known-issues/postgresql/#merge-command",
 }
 
 func NewMergeStatementIssue(objectType string, objectName string, sqlStatement string) QueryIssue {
diff --git a/yb-voyager/src/utils/commonVariables.go b/yb-voyager/src/utils/commonVariables.go
index 38a924486e..6ea9815f5b 100644
--- a/yb-voyager/src/utils/commonVariables.go
+++ b/yb-voyager/src/utils/commonVariables.go
@@ -100,7 +100,7 @@ type DBObject struct {
 
 // TODO: support MinimumVersionsFixedIn in xml
 type AnalyzeSchemaIssue struct {
-	// TODO: rename IssueType to Category
+	// TODO: deprecate this and rename to Category
 	IssueType              string                          `json:"IssueType"` //category: unsupported_features, unsupported_plpgsql_objects, etc
 	ObjectType             string                          `json:"ObjectType"`
 	ObjectName             string                          `json:"ObjectName"`