diff --git a/src/WorkFlowCheck.Common/DTO/CheckListRowDTO.cs b/src/WorkFlowCheck.Common/DTO/CheckListRowDTO.cs
index 129476e..01b3d9e 100644
--- a/src/WorkFlowCheck.Common/DTO/CheckListRowDTO.cs
+++ b/src/WorkFlowCheck.Common/DTO/CheckListRowDTO.cs
@@ -14,7 +14,7 @@ namespace WorkFlowCheck.Common.DTO
         public int CheckListHeaderId { get; set; }
         public int CheckListTemplateRowId { get; set; }
         public CheckListTemplateRowDTO? CheckListTemplateRowDTO { get; set; }
-        public string GroupName => $"AnswerGroup_{CheckListTemplateRowDTO?.RowIndex ?? 0}";
+        public string GroupName => $"AnswerGroup_{CheckListTemplateRowDTO?.Id ?? 0}";
 
         [DisplayName("Eredmény")]
         public string Answer { get; set; } = null!;
diff --git a/src/WorkFlowCheck.MAUI/Helper/SystemHelper.cs b/src/WorkFlowCheck.MAUI/Helper/SystemHelper.cs
index 444266a..520e745 100644
--- a/src/WorkFlowCheck.MAUI/Helper/SystemHelper.cs
+++ b/src/WorkFlowCheck.MAUI/Helper/SystemHelper.cs
@@ -19,7 +19,7 @@ namespace WorkFlowCheck.MAUI.Helper
         public static string DatabaseName = "";
         public static bool Syncronised = false;
         public static UserDTO SystemUserDTO;
-        public static string ProgramVersion = "v1.1.033";
+        public static string ProgramVersion = "v1.1.035";
 
 #if DEBUG
         //public static string ApiBaseUrl = $"http://10.0.2.2:59027/";
diff --git a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListWorkPage.xaml b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListWorkPage.xaml
index 7d968db..ff95f4c 100644
--- a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListWorkPage.xaml
+++ b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListWorkPage.xaml
@@ -104,14 +104,14 @@
                             Content="Igen"
                             Value="Igen"
                             BindableGroupName="{Binding GroupName}"
-                            IsChecked="{Binding AnswerYes}" 
+                            IsChecked="{Binding AnswerYes, Mode=TwoWay}" 
                             HorizontalOptions="Center" VerticalOptions="Center"/>
                         <local:BindableRadioButton
                             Grid.Row="1"
                             Content="Nem"
                             Value="Nem"
                             BindableGroupName="{Binding GroupName}"
-                            IsChecked="{Binding AnswerNo}"
+                            IsChecked="{Binding AnswerNo, Mode=TwoWay}"
                             HorizontalOptions="Center" VerticalOptions="Center"/>
                     </Grid>
                 </Grid>
@@ -185,14 +185,14 @@
                             Content="Igen"
                             Value="Igen"
                             BindableGroupName="{Binding GroupName}"
-                            IsChecked="{Binding AnswerYes}" 
+                            IsChecked="{Binding AnswerYes, Mode=TwoWay}" 
                             HorizontalOptions="Center" VerticalOptions="Center"/>
                         <local:BindableRadioButton
                             Grid.Row="1"
                             Content="Nem"
                             Value="Nem"
                             BindableGroupName="{Binding GroupName}"
-                            IsChecked="{Binding AnswerNo}"
+                            IsChecked="{Binding AnswerNo, Mode=TwoWay}"
                             HorizontalOptions="Center" VerticalOptions="Center"/>
                     </Grid>
                 </Grid>
@@ -219,14 +219,14 @@
                             Content="Igen"
                             Value="Igen"
                             BindableGroupName="{Binding GroupName}"
-                            IsChecked="{Binding AnswerYes}" 
+                            IsChecked="{Binding AnswerYes, Mode=TwoWay}" 
                             HorizontalOptions="Center" VerticalOptions="Center"/>
                         <local:BindableRadioButton
                             Grid.Row="1"
                             Content="Nem"
                             Value="Nem"
                             BindableGroupName="{Binding GroupName}"
-                            IsChecked="{Binding AnswerNo}"
+                            IsChecked="{Binding AnswerNo, Mode=TwoWay}"
                             HorizontalOptions="Center" VerticalOptions="Center"/>
                     </Grid>
                 </Grid>
@@ -253,14 +253,14 @@
                             Content="Igen"
                             Value="Igen"
                             BindableGroupName="{Binding GroupName}"
-                            IsChecked="{Binding AnswerYes}" 
+                            IsChecked="{Binding AnswerYes, Mode=TwoWay}" 
                             HorizontalOptions="Center" VerticalOptions="Center"/>
                         <local:BindableRadioButton
                             Grid.Row="1"
                             Content="Nem"
                             Value="Nem"
                             BindableGroupName="{Binding GroupName}"
-                            IsChecked="{Binding AnswerNo}"
+                            IsChecked="{Binding AnswerNo, Mode=TwoWay}"
                             HorizontalOptions="Center" VerticalOptions="Center"/>
                     </Grid>
                 </Grid>
@@ -287,14 +287,14 @@
                             Content="Igen"
                             Value="Igen"
                             BindableGroupName="{Binding GroupName}"
-                            IsChecked="{Binding AnswerYes}" 
+                            IsChecked="{Binding AnswerYes, Mode=TwoWay}" 
                             HorizontalOptions="Center" VerticalOptions="Center"/>
                         <local:BindableRadioButton
                             Grid.Row="1"
                             Content="Nem"
                             Value="Nem"
                             BindableGroupName="{Binding GroupName}"
-                            IsChecked="{Binding AnswerNo}"
+                            IsChecked="{Binding AnswerNo, Mode=TwoWay}"
                             HorizontalOptions="Center" VerticalOptions="Center"/>
                     </Grid>
                 </Grid>
diff --git a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListWorkPage.xaml.cs b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListWorkPage.xaml.cs
index d26043c..a68c7f9 100644
--- a/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListWorkPage.xaml.cs
+++ b/src/WorkFlowCheck.MAUI/Pages/CheckList/CheckListWorkPage.xaml.cs
@@ -239,6 +239,33 @@ public class BindableRadioButton : RadioButton
             radioButton.GroupName = newGroupName;
         }
     }
+    public BindableRadioButton()
+    {
+        CheckedChanged += OnCheckedChangedInternal;
+    }
+    private void OnCheckedChangedInternal(object sender, CheckedChangedEventArgs e)
+    {
+        if (e.Value && BindingContext is CheckListRowDTO dto)
+        {
+            if (Value?.ToString() == "Igen")
+                dto.Answer = "Igen";
+            else if (Value?.ToString() == "Nem")
+                dto.Answer = "Nem";
+        }
+    }
+
+    protected override void OnBindingContextChanged()
+    {
+        base.OnBindingContextChanged();
+
+        if (BindingContext is CheckListRowDTO dto)
+        {
+            if (Value?.ToString() == "Igen")
+                IsChecked = dto.Answer == "Igen";
+            else if (Value?.ToString() == "Nem")
+                IsChecked = dto.Answer == "Nem";
+        }
+    }
 }
 public class ByteArrayToImageSourceConverter : IValueConverter
 {