Shell columns now includes RequiredColumns

InABox.Avalonia/DataModels/ShellColumns.cs

@@ -56,7 +56,15 @@ namespace InABox.Avalonia
             return null;
         }
 
-        public Columns<TEntity> Columns => new Columns<TEntity>(ColumnTypeFlags.None).Add(_columns.Select(x => x.Value.ColumnName));
+        public Columns<TEntity> Columns
+        {
+            get
+            {
+                var columns = new Columns<TEntity>(ColumnTypeFlags.None).Add(_columns.Values.Select(x => x.ColumnName));
+                columns.Add(new Columns<TEntity>(ColumnTypeFlags.Required)); // Have to be added after the other columns to preserve column indexing.
+                return columns;
+            }
+        }
         
         public int Count => _columns.Count;
 

InABox.Core/Query/Column.cs

@@ -366,7 +366,7 @@ namespace InABox.Core
                 {
                     columns.Add(new Column<T>(prop));
                 }
-                else
+                else if(flags != ColumnTypeFlags.Required) // If there is another flag other than Required
                 {
                     var isLocal = !prop.HasParentEntityLink()
                         || (prop.Parent?.HasParentEntityLink() != true && prop.Name.EndsWith(".ID"));