diff --git a/octgnFX/Octgn.DataNew/CardPropertyComparer.cs b/octgnFX/Octgn.DataNew/CardPropertyComparer.cs
index a6e06b47c..d884b0f8f 100644
--- a/octgnFX/Octgn.DataNew/CardPropertyComparer.cs
+++ b/octgnFX/Octgn.DataNew/CardPropertyComparer.cs
@@ -10,6 +10,8 @@ public class CardPropertyComparer : IComparer, IComparer<ICard>
     {
         private readonly PropertyDef _property;
 
+        public PropertyDef Property { get { return _property; } }
+
         public CardPropertyComparer(PropertyDef property)
         {
             _property = property;
@@ -35,9 +37,35 @@ public int Compare(ICard x, ICard y)
             x.PropertySets[x.Alternate].Properties.TryGetValue(_property, out object px);
             y.PropertySets[y.Alternate].Properties.TryGetValue(_property, out object py);
             if (px == null) return py == null ? 0 : -1;
+            if (int.TryParse(px.ToString(), out int px2) && int.TryParse(py.ToString(), out int py2))
+            {
+                return px2.CompareTo(py2);
+            }
             return px.ToString().CompareTo(py.ToString());
         }
 
         #endregion
     }
+    public class CompoundComparer : IComparer
+    {
+        private readonly IComparer first;
+        private readonly IComparer second;
+
+        public CompoundComparer(IComparer first, IComparer second)
+        {
+            this.first = first;
+            this.second = second;
+        }
+
+        public int Compare(object x, object y)
+        {
+            int result = this.first.Compare(x, y);
+            if (result != 0)
+            {
+                return result;
+            }
+            return second.Compare(x, y);
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/octgnFX/Octgn.JodsEngine/Play/Dialogs/LimitedDialog.xaml b/octgnFX/Octgn.JodsEngine/Play/Dialogs/LimitedDialog.xaml
index 754965485..a6c385637 100644
--- a/octgnFX/Octgn.JodsEngine/Play/Dialogs/LimitedDialog.xaml
+++ b/octgnFX/Octgn.JodsEngine/Play/Dialogs/LimitedDialog.xaml
@@ -1,67 +1,90 @@
-<Window x:Class="Octgn.Play.Dialogs.LimitedDialog" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Name="This" Title="Start a limited game" Width="541"
+<Window xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:Controls="clr-namespace:Octgn.Controls" x:Class="Octgn.Play.Dialogs.LimitedDialog" x:Name="This" Title="Start a limited game" Width="541"
         Style="{StaticResource Window}" ShowInTaskbar="False" WindowStartupLocation="CenterOwner" SizeToContent="Height">
-  <Border Style="{StaticResource Panel}" Margin="4">
-    <Grid Margin="8">
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="Auto" MinWidth="100" />
-        <ColumnDefinition Width="*" />
-      </Grid.ColumnDefinitions>
-      <Grid.RowDefinitions>
-        <RowDefinition Height="Auto" />
-        <RowDefinition Height="Auto" />
-        <RowDefinition Height="Auto" />
-        <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-      <TextBlock Text="Kind of game:" Margin="2" />
-      <TextBlock Grid.Column="1" Margin="2">
-        <Bold>Sealed</Bold>
-        <Italic>
-          (sorry, no other option in this release)
-        </Italic>
-      </TextBlock>
-      <TextBlock Text="Packs:" Grid.Row="1" Margin="2" />
-      <StackPanel Grid.Row="1" Grid.Column="1" Margin="2">
-        <Grid>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="Auto" />
-          </Grid.ColumnDefinitions>
-          <ComboBox x:Name="setsCombo" ItemsSource="{Binding Sets, ElementName=This, Mode=OneTime}"
+    <Border Style="{StaticResource Panel}" Margin="4" RenderTransformOrigin="0.5,0.5">
+        <Border.RenderTransform>
+            <TransformGroup>
+                <ScaleTransform ScaleY="1"/>
+                <SkewTransform/>
+                <RotateTransform/>
+                <TranslateTransform/>
+            </TransformGroup>
+        </Border.RenderTransform>
+        <Grid Margin="8">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" MinWidth="100" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <TextBlock Text="Kind of game:" Margin="2" />
+            <TextBlock Grid.Column="1" Margin="2"><Bold><Run Text="Sealed"/></Bold><Run Text=" "/><Italic><Run Text="(sorry, no other option in this release)"/></Italic></TextBlock>
+            <TextBlock Text="Packs:" Grid.Row="1" Margin="2" />
+            <StackPanel Grid.Row="1" Grid.Column="1" Margin="2">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <ComboBox x:Name="setsCombo" ItemsSource="{Binding Sets, ElementName=This, Mode=OneTime}"
                     DisplayMemberPath="Name" VerticalContentAlignment="Center" />
-          <ComboBox x:Name="packsCombo" Grid.Column="1" Margin="2,0"
-                    ItemsSource="{Binding ElementName=setsCombo, Path=SelectedItem.Packs}"  DisplayMemberPath="Name" VerticalContentAlignment="Center" />
-          <Button Content="Add" FontSize="14" Grid.Column="2" Width="80" Padding="2" Click="AddSetClicked" Style="{StaticResource FlatDarkButtonStyle}"/>
-        </Grid>
-        <ListBox ItemsSource="{Binding Packs, ElementName=This, Mode=OneTime}" Margin="0,4,0,0" MinHeight="100" ScrollViewer.VerticalScrollBarVisibility="Auto" MaxHeight="300">
-          <ListBox.ItemTemplate>
-            <DataTemplate>
-              <StackPanel Orientation="Horizontal" Background="Transparent">
-                <Button VerticalAlignment="Center" Margin="2,0,5,0" Cursor="Hand" Click="RemoveClicked">
-                  <Button.Template>
-                    <ControlTemplate>
-                      <Border Background="Transparent">
-                        <Path Data="M 0,0 L 12,12 M 12,0 L 0,12" Stroke="#e84000" StrokeThickness="3" />
-                      </Border>
-                    </ControlTemplate>
-                  </Button.Template>
-                </Button>
-                <TextBlock Text="{Binding FullName, Mode=OneTime}" />
-              </StackPanel>
-            </DataTemplate>
-          </ListBox.ItemTemplate>
-        </ListBox>
-      </StackPanel>
-      <StackPanel Orientation="Horizontal" Grid.Row="3" Grid.ColumnSpan="2" HorizontalAlignment="Right"
+                    <ComboBox x:Name="packsCombo" Grid.Column="1" Margin="2,0"
+                    ItemsSource="{Binding SelectedItem.Packs, ElementName=setsCombo}"  DisplayMemberPath="Name" VerticalContentAlignment="Center" />
+                    <Button Content="Add" FontSize="14" Grid.Column="2" Width="80" Padding="2" Click="AddSetClicked" Style="{StaticResource FlatDarkButtonStyle}"/>
+                    <Controls:NumericUpDown x:Name="packsAmount"  FontSize="14" Grid.Column="3" Minimum="1" Margin="4,3,0,3" ScrollViewer.VerticalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto" Maximum="120" RenderTransformOrigin="0.5,0.5" >
+                        <Controls:NumericUpDown.LayoutTransform>
+                            <TransformGroup>
+                                <ScaleTransform ScaleX="1" ScaleY="1"/>
+                                <SkewTransform/>
+                                <RotateTransform/>
+                                <TranslateTransform/>
+                            </TransformGroup>
+                        </Controls:NumericUpDown.LayoutTransform>
+                        <Controls:NumericUpDown.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform ScaleX="1.1" ScaleY="1.3"/>
+                                <SkewTransform/>
+                                <RotateTransform/>
+                                <TranslateTransform X="0" Y="0"/>
+                            </TransformGroup>
+                        </Controls:NumericUpDown.RenderTransform>
+                    </Controls:NumericUpDown>
+
+                </Grid>
+                <ListBox ItemsSource="{Binding Packs, ElementName=This, Mode=OneTime}" Margin="0,4,0,0" MinHeight="100" ScrollViewer.VerticalScrollBarVisibility="Auto" MaxHeight="300">
+                    <ListBox.ItemTemplate>
+                        <DataTemplate>
+                            <StackPanel Orientation="Horizontal" Background="Transparent">
+                                <Button VerticalAlignment="Center" Margin="2,0,5,0" Cursor="Hand" Click="RemoveClicked">
+                                    <Button.Template>
+                                        <ControlTemplate>
+                                            <Border Background="Transparent">
+                                                <Path Data="M 0,0 L 12,12 M 12,0 L 0,12" Stroke="#e84000" StrokeThickness="3" />
+                                            </Border>
+                                        </ControlTemplate>
+                                    </Button.Template>
+                                </Button>
+                                <TextBlock Text="{Binding FullName, Mode=OneTime}" />
+                            </StackPanel>
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+                </ListBox>
+            </StackPanel>
+            <StackPanel Orientation="Horizontal" Grid.Row="3" Grid.ColumnSpan="2" HorizontalAlignment="Right"
                   VerticalAlignment="Top" Margin="0,16,0,4">
-        <ComboBox x:Name="addCards" VerticalContentAlignment="Center" Margin="0,0,8,0" Width="Auto" SelectedIndex="0" Visibility="Hidden">
-                    <ComboBoxItem>Add packs to my Limited Pool</ComboBoxItem>
-                    <ComboBoxItem>Add packs to everyone's Limited Pool</ComboBoxItem>
+                <ComboBox x:Name="addCards" VerticalContentAlignment="Center" Margin="0,0,8,0" Width="Auto" SelectedIndex="0" Visibility="Hidden">
+                    <ComboBoxItem Content="Add packs to my Limited Pool"/>
+                    <ComboBoxItem Content="Add packs to everyone's Limited Pool"/>
                 </ComboBox>
-        <Button Content="OK" FontSize="14" Click="StartClicked" Margin="0,0,8,0" Width="100" Style="{StaticResource FlatDarkGreenButtonStyle}" />
-        <Button Content="Cancel" FontSize="14" Click="CancelClicked" Width="100" Style="{StaticResource FlatDarkButtonStyle}"/>
-      </StackPanel>
-    </Grid>
-  </Border>
+                <Button Content="OK" FontSize="14" Click="StartClicked" Margin="0,0,8,0" Width="100" Style="{StaticResource FlatDarkGreenButtonStyle}" />
+                <Button Content="Cancel" FontSize="14" Click="CancelClicked" Width="100" Style="{StaticResource FlatDarkButtonStyle}"/>
+            </StackPanel>
+        </Grid>
+    </Border>
 </Window>
\ No newline at end of file
diff --git a/octgnFX/Octgn.JodsEngine/Play/Dialogs/LimitedDialog.xaml.cs b/octgnFX/Octgn.JodsEngine/Play/Dialogs/LimitedDialog.xaml.cs
index fa8de08a3..d4139042a 100644
--- a/octgnFX/Octgn.JodsEngine/Play/Dialogs/LimitedDialog.xaml.cs
+++ b/octgnFX/Octgn.JodsEngine/Play/Dialogs/LimitedDialog.xaml.cs
@@ -41,7 +41,10 @@ private void AddSetClicked(object sender, RoutedEventArgs e)
             // WPF ListBox doesn't like having multiple copies of the same 
             // instance and messes up selection
             var pack = (DataNew.Entities.Pack) packsCombo.SelectedItem;
-            Packs.Add(new SelectedPack {Id = pack.Id, FullName = pack.GetFullName()});
+            for (int i = 0; i < packsAmount.Value; i++)
+            {
+                Packs.Add(new SelectedPack {Id = pack.Id, FullName = pack.GetFullName()});
+            }
         }
 
         private void StartClicked(object sender, RoutedEventArgs e)
diff --git a/octgnFX/Octgn.JodsEngine/Play/Dialogs/PickCardsDialog.xaml b/octgnFX/Octgn.JodsEngine/Play/Dialogs/PickCardsDialog.xaml
index 11473f4c4..83e790db7 100644
--- a/octgnFX/Octgn.JodsEngine/Play/Dialogs/PickCardsDialog.xaml
+++ b/octgnFX/Octgn.JodsEngine/Play/Dialogs/PickCardsDialog.xaml
@@ -148,11 +148,11 @@ Template="{StaticResource ExpanderButton}" />
 
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="3*" />
-            <ColumnDefinition Width="2*" />
+            <ColumnDefinition Width="59*" />
+            <ColumnDefinition Width="30*" />
         </Grid.ColumnDefinitions>
 
-        <TabControl x:Name="TabControlMain" Margin="4">
+        <TabControl x:Name="TabControlMain" Margin="4,4,4,4">
             <TabItem HeaderStringFormat="Card pool ({0})"
                Header="{Binding CardPool.Count, ElementName=This, FallbackValue=0}">
                 <Grid>
@@ -177,6 +177,7 @@ Template="{StaticResource ExpanderButton}" />
                                   DisplayMemberPath="Key" MinWidth="100"/>
                         <Grid Margin="0,0,5,0"/>
                         <Button Content="Move" Width="50" Click="ButtonMoveClick" Style="{StaticResource FlatDarkButtonStyle}"/>
+                        <Button Content="Return" Width="50" Click="ButtonReturnClick" Style="{StaticResource FlatDarkButtonStyle}"/>
                     </StackPanel>
                     <ProgressBar x:Name="ProgressBarLoading" Visibility="Visible" Height="20" Grid.Row="1" Grid.ColumnSpan="2"/>
                     <Border x:Name="FilterListBox" Style="{StaticResource ControlBorder}" Padding="0" Margin="0,2,0,0" Width="200" Grid.Row="2" Grid.Column="0">
@@ -195,7 +196,7 @@ Template="{StaticResource ExpanderButton}" />
             </TabItem>
         </TabControl>
 
-        <GridSplitter HorizontalAlignment="Right" Width="4" Background="Transparent" />
+        <GridSplitter HorizontalAlignment="Left" Width="4" Background="Transparent" Margin="487,0,0,0" />
 
         <TabControl x:Name="deckTabs" Grid.Column="1" Margin="0,4,4,4"
                 ItemsSource="{Binding Path=LimitedDeck.Sections, ElementName=This, Mode=OneTime}">
@@ -219,8 +220,8 @@ Template="{StaticResource ExpanderButton}" />
             </TabControl.ContentTemplate>
         </TabControl>
 
-        <Popup x:Name="quantityPopup" Placement="Mouse" StaysOpen="False" AllowsTransparency="True" Width="170"
-           PopupAnimation="Fade">
+        <Popup x:Name="quantityPopup" Placement="Mouse" StaysOpen="False" AllowsTransparency="True"
+           PopupAnimation="Fade" Margin="160,0,161,0">
             <Border CornerRadius="5" BorderThickness="1" BorderBrush="#E0888888" Background="#E0FFFFFF" Margin="8">
                 <Border.Effect>
                     <DropShadowEffect Opacity="0.4" />
diff --git a/octgnFX/Octgn.JodsEngine/Play/Dialogs/PickCardsDialog.xaml.cs b/octgnFX/Octgn.JodsEngine/Play/Dialogs/PickCardsDialog.xaml.cs
index 38b602afe..ccd1e90a7 100644
--- a/octgnFX/Octgn.JodsEngine/Play/Dialogs/PickCardsDialog.xaml.cs
+++ b/octgnFX/Octgn.JodsEngine/Play/Dialogs/PickCardsDialog.xaml.cs
@@ -18,7 +18,7 @@
 namespace Octgn.Play.Dialogs
 {
     using System.Threading.Tasks;
-
+    using Microsoft.Scripting.Utils;
     using Octgn.Core.DataExtensionMethods;
     using Octgn.DataNew;
     using Octgn.DataNew.Entities;
@@ -40,7 +40,7 @@ public PickCardsDialog()
             InitializeComponent();
         }
 
-        public ListCollectionView CardPoolView { get; private set; }
+        public ListCollectionView CardPoolView { get; set; }
         public List<object> SortProperties { get; private set; }
         public ObservableCollection<ObservableMultiCard> CardPool { get; private set; }
         public ListCollectionView UnlimitedPoolView { get; private set; }
@@ -49,10 +49,19 @@ public PickCardsDialog()
         public ObservableCollection<Filter> Filters { get; private set; }
         public bool FiltersVisible { get; set; }
 
+        private IComparer<String> KeyComparer = new KeyComparer();
         private void SortChanged(object sender, SelectionChangedEventArgs e)
         {
             if (sortBox.SelectedItem == null) return;
-            CardPoolView.CustomSort = new CardPropertyComparer(((PropertyDef)sortBox.SelectedItem));
+            if (sortBox.SelectionBoxItem is String)
+            {
+                CardPoolView.CustomSort = new CompoundComparer(new CardPropertyComparer((PropertyDef)sortBox.SelectedItem), new CardPropertyComparer(new NamePropertyDef()));
+            }
+            else
+            {
+                CardPoolView.CustomSort = new CompoundComparer(new CardPropertyComparer((PropertyDef)sortBox.SelectedItem), new CompoundComparer(new CardPropertyComparer((PropertyDef)sortBox.SelectionBoxItem), new CardPropertyComparer(new NamePropertyDef())));
+            }
+            
         }
 
         public void OpenPacks(IEnumerable<Guid> packs)
@@ -361,7 +370,7 @@ private void UpdateFilters()
                 {
                     case PropertyType.Integer:
                         Filter filter3 = filter;
-                        IEnumerable<EnumFilterValue> q = from ObservableMultiCard c in CardPoolView
+                        IEnumerable<EnumFilterValue> q = (from ObservableMultiCard c in CardPoolView
                                                          let all = this.GetCardPropertyValue(c, prop)
                                                          where all != null
                                                          group c by all
@@ -373,7 +382,7 @@ orderby g.Key
                                                                  Property = filter3.Property,
                                                                  Value = g.Key,
                                                                  Count = g.Count()
-                                                             };
+                                                             }).OrderBy(x => x.Value, KeyComparer); ;
                         foreach (EnumFilterValue filterValue in q)
                             filter.Values.Add(filterValue);
                         break;
@@ -383,7 +392,7 @@ orderby g.Key
                         {
                             case PropertyTextKind.Enumeration:
                                 Filter filter2 = filter;
-                                IEnumerable<EnumFilterValue> q3 = from ObservableMultiCard c in CardPoolView
+                                IEnumerable<EnumFilterValue> q3 = (from ObservableMultiCard c in CardPoolView
                                                                  let all = this.GetCardPropertyValue(c, prop)
                                                                  where all != null
                                                                  group c by all
@@ -395,13 +404,13 @@ orderby g.Key
                                                                          Property = filter2.Property,
                                                                          Value = g.Key.ToString(),
                                                                          Count = g.Count()
-                                                                     };
+                                                                     }).OrderBy(x => x.Value, KeyComparer);
                                 foreach (EnumFilterValue filterValue in q3)
                                     filter.Values.Add(filterValue);
                                 break;
                             case PropertyTextKind.Tokens:
                                 Filter filter1 = filter;
-                                IEnumerable<TokenFilterValue> q2 = from ObservableMultiCard c in CardPoolView
+                                IEnumerable<TokenFilterValue> q2 = (from ObservableMultiCard c in CardPoolView
                                                                    let all = this.GetCardPropertyValue(c, prop)
                                                                    where all != null
                                                                    from token in
@@ -416,7 +425,7 @@ orderby g.Key
                                                                            Property = filter1.Property,
                                                                            Value = g.Key,
                                                                            Count = g.Count()
-                                                                       };
+                                                                       }).OrderBy(x => x.Value, KeyComparer); ;
                                 foreach (TokenFilterValue filterValue in q2)
                                     filter.Values.Add(filterValue);
                                 break;
@@ -617,15 +626,17 @@ public override bool IsValueMatch(object value)
 
         private void ButtonMoveClick(object sender, RoutedEventArgs e)
         {
+            var list = new ListCollectionView(CardPool.ToArray());
+            list.Filter = CardPoolView.Filter;
+            list.CustomSort = CardPoolView.CustomSort;
             if (ComboBoxDeckSection.SelectedIndex < 0) return;
-            var list = CardPool.ToArray();
             var cbSection = (KeyValuePair<string, DeckSection>)ComboBoxDeckSection.SelectedItem;
             var section =
                 deckTabs.Items.OfType<ObservableSection>()
                     .FirstOrDefault(
                         x => x.Name.Equals(cbSection.Value.Name, StringComparison.InvariantCultureIgnoreCase));
             if (section == null) return;
-            foreach (var c in list)
+            foreach (ObservableMultiCard c in list)
             {
                 CardPool.Remove(c);
                 var element = section.Cards.FirstOrDefault(x => x.Id == c.Id); //.AsObservable();
@@ -634,6 +645,22 @@ private void ButtonMoveClick(object sender, RoutedEventArgs e)
             }
 
         }
+
+        private void ButtonReturnClick(object sender, RoutedEventArgs e)
+        {
+            var section = deckTabs.SelectedItem as ObservableSection;
+
+            for (int i = 0; i < section.Cards.Count();)
+            {
+                var card = section.Cards.ElementAt(i);
+                for (var c = card.Quantity - 1; c >= 0; c--)
+                {
+                    card.Quantity = 1;
+                    CardPool.Add(card.AsObservable());
+                }
+                section.Cards.RemoveCard(card);
+            }
+        }
     }
 
     public class FilterTemplateSelector : DataTemplateSelector
@@ -661,4 +688,82 @@ public override DataTemplate SelectTemplate(object item, DependencyObject contai
             throw new InvalidOperationException("Unexpected property type: " + filter.Property.Type);
         }
     }
+
+    public class KeyComparer : IComparer<string>
+    {
+        public int Compare(string x, string y)
+        {
+            int indexX = 0;
+            int indexY = 0;
+            while (true)
+            {
+                // Handle the case when one string has ended.
+                if (indexX == x.Length)
+                {
+                    return indexY == y.Length ? 0 : -1;
+                }
+                if (indexY == y.Length)
+                {
+                    return 1;
+                }
+
+                char charX = x[indexX];
+                char charY = y[indexY];
+                if (char.IsDigit(charX) && char.IsDigit(charY))
+                {
+                    // Skip leading zeroes in numbers.
+                    while (indexX < x.Length && x[indexX] == '0')
+                    {
+                        indexX++;
+                    }
+                    while (indexY < y.Length && y[indexY] == '0')
+                    {
+                        indexY++;
+                    }
+
+                    // Find the end of numbers
+                    int endNumberX = indexX;
+                    int endNumberY = indexY;
+                    while (endNumberX < x.Length && char.IsDigit(x[endNumberX]))
+                    {
+                        endNumberX++;
+                    }
+                    while (endNumberY < y.Length && char.IsDigit(y[endNumberY]))
+                    {
+                        endNumberY++;
+                    }
+
+                    int digitsLengthX = endNumberX - indexX;
+                    int digitsLengthY = endNumberY - indexY;
+
+                    // If the lengths are different, then the longer number is bigger
+                    if (digitsLengthX != digitsLengthY)
+                    {
+                        return digitsLengthX - digitsLengthY;
+                    }
+                    // Compare numbers digit by digit
+                    while (indexX < endNumberX)
+                    {
+                        if (x[indexX] != y[indexY])
+                            return x[indexX] - y[indexY];
+                        indexX++;
+                        indexY++;
+                    }
+                }
+                else
+                {
+                    // Plain characters comparison
+                    int compareResult = char.ToUpperInvariant(charX).CompareTo(char.ToUpperInvariant(charY));
+                    if (compareResult != 0)
+                    {
+                        return compareResult;
+                    }
+                    indexX++;
+                    indexY++;
+                }
+            }
+        }
+
+    }
+
 }
diff --git a/octgnFX/Octgn.JodsEngine/Play/Gui/TableCanvas.cs b/octgnFX/Octgn.JodsEngine/Play/Gui/TableCanvas.cs
index ab7e32dbc..0315fc593 100644
--- a/octgnFX/Octgn.JodsEngine/Play/Gui/TableCanvas.cs
+++ b/octgnFX/Octgn.JodsEngine/Play/Gui/TableCanvas.cs
@@ -146,16 +146,20 @@ private void Untargetting(object sender, EventArgs e)
             CardControl card = (from ContentPresenter child in Children
                                 where child.DataContext == targetAction.FromCard
                                 select VisualTreeHelper.GetChild(child, 0) as CardControl).FirstOrDefault();
-            if (card == null) return; // Opponent moved the card out of the table concurently
-
-            AdornerLayer layer = AdornerLayer.GetAdornerLayer(card);
-            Adorner[] adorners = layer.GetAdorners(card);
-            if (adorners == null) return; // Opponent removed the target card out of the table concurently
-            foreach (ArrowAdorner arrow in adorners.OfType<ArrowAdorner>())
+            if (card != null)
             {
-                layer.Remove(arrow);
-            }
+                AdornerLayer layer = AdornerLayer.GetAdornerLayer(card);
+                Adorner[] adorners = layer.GetAdorners(card);
+                // Opponent removed the target card out of the table concurently
+                if (adorners != null)
+                {
+                    foreach (ArrowAdorner arrow in adorners.OfType<ArrowAdorner>())
+                    {
+                        layer.Remove(arrow);
+                    }
+                }
 
+            }
             targetAction.FromCard.TargetsOtherCards = false;
         }
     }