diff --git a/knowledge-base/gantt-kb-tooltip-access-model-fields.md b/knowledge-base/gantt-kb-tooltip-access-model-fields.md
deleted file mode 100644
index 8744dff32b..0000000000
--- a/knowledge-base/gantt-kb-tooltip-access-model-fields.md
+++ /dev/null
@@ -1,143 +0,0 @@
----
-title: Access Model Fields in the Gantt Timeline Tooltip
-description: How to access and display fields from the model in the Tooltip of the Gantt Timeline?
-type: how-to
-page_title: How to Display Model Fields in the Gantt Tooltip?
-slug: gantt-kb-tooltip-access-model-fields
-tags: gantt, blazor, tooltip, tooltiptemplate, model, fields
-res_type: kb
-ticketid: 1653280
----
-
-## Environment
-
-
-
- | Product |
- Gantt for Blazor |
-
-
-
-
-## Description
-
-I want to access and display model fields in the Gantt Timeline Tooltip. In the [`TooltipTemplate`]({%slug gantt-tooltip-template%}) I can access some of the model fields, which [match the properties of a Gantt Tree item]({%slug gantt-data-binding-overview%}#data-bindings). But how to access and show all model fields?
-
-## Solution
-
-You can access and display all fields of the model in the [Gantt Timeline `TooltipTemplate`]({%slug gantt-tooltip-template%}). Follow these steps:
-
-1. Cast the `TooltipTemplate` `context` to `TooltipTemplateContext`.
-2. Use the [available properties of the `TooltipTemplateContext`](https://docs.telerik.com/blazor-ui/api/Telerik.Blazor.Components.TooltipTemplateContext) to find the data item in the Gantt data collection.
-3. Display the desired fields of the model instance in the `TooltipTemplate`.
-
-````CSHTML
-
-
- @{
- FlatModel model = GetModel(((TooltipTemplateContext)context).Title);
- }
- @model.CustomField
-
- @model.SomeIntField
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-@code {
- private List Data { get; set; }
-
- private FlatModel GetModel(string title)
- {
- return Data.FirstOrDefault(x => x.Title == title);
- }
-
- public class FlatModel
- {
- public int Id { get; set; }
- public int? ParentId { get; set; }
- public string Title { get; set; }
- public double PercentComplete { get; set; }
- public DateTime Start { get; set; }
- public DateTime End { get; set; }
- public string CustomField { get; set; }
- public int SomeIntField {get; set;}
- }
-
- public int LastId { get; set; } = 1;
-
- protected override void OnInitialized()
- {
- Data = new List();
- var random = new Random();
-
- for (int i = 1; i < 6; i++)
- {
- var newItem = new FlatModel()
- {
- Id = LastId,
- Title = "Task " + i.ToString(),
- Start = new DateTime(2021, 7, 5 + i),
- End = new DateTime(2021, 7, 11 + i),
- PercentComplete = Math.Round(random.NextDouble(), 2),
- CustomField = "Details for task " + i,
- SomeIntField = i
- };
-
- Data.Add(newItem);
- var parentId = LastId;
- LastId++;
-
- for (int j = 0; j < 5; j++)
- {
- Data.Add(new FlatModel()
- {
- Id = LastId,
- ParentId = parentId,
- Title = " Task " + i + " : " + j.ToString(),
- Start = new DateTime(2021, 7, 5 + j),
- End = new DateTime(2021, 7, 6 + i + j),
- PercentComplete = Math.Round(random.NextDouble(), 2),
- CustomField = "Details for task " + i,
- SomeIntField = j
- });
-
- LastId++;
- }
- }
-
- base.OnInitialized();
- }
-}
-````
-
-## See Also
-
-- [Gantt Overview - Telerik UI for Blazor]({%slug gantt-overview%})
-- Live Demo: Gantt Templates
\ No newline at end of file
diff --git a/knowledge-base/gantt-tooltip-access-model-fields.md b/knowledge-base/gantt-tooltip-access-model-fields.md
new file mode 100644
index 0000000000..8e987d1d7b
--- /dev/null
+++ b/knowledge-base/gantt-tooltip-access-model-fields.md
@@ -0,0 +1,276 @@
+---
+title: Access Model Fields in the Gantt Timeline Tooltip
+description: How to access and display fields from the model in the Tooltip of the Gantt Timeline?
+type: how-to
+page_title: How to Display Model Fields in the Gantt Tooltip?
+slug: gantt-kb-tooltip-access-model-fields
+tags: gantt, blazor, tooltip, tooltiptemplate, model, fields
+res_type: kb
+ticketid: 1653280
+---
+
+## Environment
+
+
+
+ | Product |
+ Gantt for Blazor |
+
+
+
+
+## Description
+
+I want to access and display model fields in the Gantt Timeline Tooltip. In the [`TooltipTemplate`]({%slug gantt-tooltip-template%}) I can access some of the model fields, which [match the properties of a Gantt Tree item]({%slug gantt-data-binding-overview%}#data-bindings). But how to access and show all model fields?
+
+## Solution
+
+You have two options to display the other fields form you model in the Tooltip:
+
+* [Get the Gantt Data Item From Context Properties](#get-the-gantt-data-item-from-context-properties)
+* [Use a Separate Tooltip Component](#use-a-separate-tooltip-component)
+
+
+### Get the Gantt Data Item From Context Properties
+
+This solution relies on finding the task item in your data based on the properties that the `TooltipTemplateContext` provides. The approach is applicable only if all items in your data have unique values for these properties and the task titles are not localized.
+
+1. Cast the [`TooltipTemplate`]({%slug gantt-tooltip-template%}) `context` to `TooltipTemplateContext`.
+2. Use the [available properties of the `TooltipTemplateContext`](/blazor-ui/api/Telerik.Blazor.Components.TooltipTemplateContext) to find the data item in the Gantt data collection. The example below uses the `Title` property.
+3. Display the desired fields of the model instance in the `TooltipTemplate`.
+
+>caption Use a custom Tooltip component
+
+````CSHTML
+
+
+ @{
+ FlatModel model = GetModel(((TooltipTemplateContext)context).Title);
+ }
+ @model.CustomField
+
+ @model.SomeIntField
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@code {
+ private List Data { get; set; }
+
+ private FlatModel GetModel(string title)
+ {
+ return Data.FirstOrDefault(x => x.Title == title);
+ }
+
+ public class FlatModel
+ {
+ public int Id { get; set; }
+ public int? ParentId { get; set; }
+ public string Title { get; set; }
+ public double PercentComplete { get; set; }
+ public DateTime Start { get; set; }
+ public DateTime End { get; set; }
+ public string CustomField { get; set; }
+ public int SomeIntField {get; set;}
+ }
+
+ public int LastId { get; set; } = 1;
+
+ protected override void OnInitialized()
+ {
+ Data = new List();
+ var random = new Random();
+
+ for (int i = 1; i < 6; i++)
+ {
+ var newItem = new FlatModel()
+ {
+ Id = LastId,
+ Title = "Task " + i.ToString(),
+ Start = new DateTime(2021, 7, 5 + i),
+ End = new DateTime(2021, 7, 11 + i),
+ PercentComplete = Math.Round(random.NextDouble(), 2),
+ CustomField = "Details for task " + i,
+ SomeIntField = i
+ };
+
+ Data.Add(newItem);
+ var parentId = LastId;
+ LastId++;
+
+ for (int j = 0; j < 5; j++)
+ {
+ Data.Add(new FlatModel()
+ {
+ Id = LastId,
+ ParentId = parentId,
+ Title = " Task " + i + " : " + j.ToString(),
+ Start = new DateTime(2021, 7, 5 + j),
+ End = new DateTime(2021, 7, 6 + i + j),
+ PercentComplete = Math.Round(random.NextDouble(), 2),
+ CustomField = "Details for task " + i,
+ SomeIntField = j
+ });
+
+ LastId++;
+ }
+ }
+
+ base.OnInitialized();
+ }
+}
+````
+
+### Use a Separate Tooltip Component
+
+This solution relies on disabling the built-in Tooltip and adding a custom one, so you have full control over its rendering and content.
+
+1. Disable the built-in Tooltip by setting the Gantt `ShowTooltip` parameter to `false`.
+1. Use a [`TaskTemplate`]({%slug gantt-task-template%}) to render a unique `id` attribute to each task.
+1. Add a [TelerikTooltip]({%slug tooltip-overview%}) in the `TaskTemplate`.
+1. Set the Tooltip's [`TargetSelector`]({%slug tooltip-overview%}#tooltip-parameters) to point to the task wrapper unique `id`.
+1. Access the model from the `context` of the `TaskTemplate` and get the needed properties to display in the Tooltip.
+
+> This approach renders a dedicated Tooltip for each task. This makes it useful if you don't have too many tasks - otherwise, you may face performance issues. In this case, either use the [above approach](#get-the-gantt-data-item-from-context-properties) or [add only one Tooltip instance as shown here]({%slug tooltip-kb-in-grid%}).
+
+>caption Use a custom Tooltip component
+
+````CSHTML
+
+
+
+
+
+ @{
+ @taskContext.CustomField
+
+ @taskContext.SomeIntField
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@code {
+ private List Data { get; set; }
+
+ public class FlatModel
+ {
+ public int Id { get; set; }
+ public int? ParentId { get; set; }
+ public string Title { get; set; }
+ public double PercentComplete { get; set; }
+ public DateTime Start { get; set; }
+ public DateTime End { get; set; }
+ public string CustomField { get; set; }
+ public int SomeIntField { get; set; }
+ }
+
+ public int LastId { get; set; } = 1;
+
+ protected override void OnInitialized()
+ {
+ Data = new List();
+ var random = new Random();
+
+ for (int i = 1; i < 6; i++)
+ {
+ var newItem = new FlatModel()
+ {
+ Id = LastId,
+ Title = "Task " + i.ToString(),
+ Start = new DateTime(2021, 7, 5 + i),
+ End = new DateTime(2021, 7, 11 + i),
+ PercentComplete = Math.Round(random.NextDouble(), 2),
+ CustomField = "Details for task " + i,
+ SomeIntField = i
+ };
+
+ Data.Add(newItem);
+ var parentId = LastId;
+ LastId++;
+
+ for (int j = 0; j < 5; j++)
+ {
+ Data.Add(new FlatModel()
+ {
+ Id = LastId,
+ ParentId = parentId,
+ Title = " Task " + i + " : " + j.ToString(),
+ Start = new DateTime(2021, 7, 5 + j),
+ End = new DateTime(2021, 7, 6 + i + j),
+ PercentComplete = Math.Round(random.NextDouble(), 2),
+ CustomField = "Details for task " + i,
+ SomeIntField = j
+ });
+
+ LastId++;
+ }
+ }
+
+ base.OnInitialized();
+ }
+}
+````
+
+## See Also
+
+- [Gantt Overview - Telerik UI for Blazor]({%slug gantt-overview%})
+- Live Demo: Gantt Templates
\ No newline at end of file