BugId-97773: Fixed preparing data for visualization