Index: /oup/current/DataAccess/Access_OUP_ADB.pas
===================================================================
--- /oup/current/DataAccess/Access_OUP_ADB.pas	(revision 242)
+++ /oup/current/DataAccess/Access_OUP_ADB.pas	(revision 243)
@@ -549,5 +549,5 @@
   SetLength(Result, 0);
   FQuery.SQL.Text := 'SELECT [src_id],[src_link_offset],[name],[size],[sep] FROM rawmap ' +
-    'WHERE [type]="' + RawType + '" ORDER BY src_id ASC, src_link_offset ASC;';
+    'WHERE [type]="' + RawType + '" and [size]>0 ORDER BY src_id ASC, src_link_offset ASC;';
   FQuery.Open;
   if FQuery.RecordCount > 0 then
Index: /oup/current/DataAccess/Access_OniArchive.pas
===================================================================
--- /oup/current/DataAccess/Access_OniArchive.pas	(revision 242)
+++ /oup/current/DataAccess/Access_OniArchive.pas	(revision 243)
@@ -508,5 +508,5 @@
     for j := 0 to Length(list) - 1 do
     begin
-      if list[j].RawType = RawType then
+      if (list[j].RawType = RawType) and (list[j].RawSize > 0) then
       begin
         SetLength(Result, Length(Result)+1);
Index: /oup/current/FileClasses/_DataTypes.pas
===================================================================
--- /oup/current/FileClasses/_DataTypes.pas	(revision 242)
+++ /oup/current/FileClasses/_DataTypes.pas	(revision 243)
@@ -835,8 +835,13 @@
   FNames := TStringList.Create;
   for i := 0 to High(ExtraArgs) do
+  begin
     case ExtraArgs[i].VType of
-      vtChar: FNames.Add(ExtraArgs[0].VChar);
-      vtAnsiString: FNames.Add(String(ExtraArgs[0].VAnsiString));
+      vtChar: FNames.Add(ExtraArgs[i].VChar);
+      vtAnsiString: FNames.Add(String(ExtraArgs[i].VAnsiString));
     end;
+    if Length(FDescription) > 0 then
+      FDescription := FDescription + #13#10;
+    FDescription := FDescription + '$' + IntToHex(1 shl i,2) + ': ' + FNames.Strings[FNames.Count - 1];
+  end;
   FDataLength := 1;
   FType := 'BitSet';
Index: /oup/current/Tools/MetaEditor.dfm
===================================================================
--- /oup/current/Tools/MetaEditor.dfm	(revision 242)
+++ /oup/current/Tools/MetaEditor.dfm	(revision 243)
@@ -85,4 +85,8 @@
       object tab_hex: TTabSheet
         Caption = 'Binary Edit'
+        ExplicitLeft = 0
+        ExplicitTop = 0
+        ExplicitWidth = 0
+        ExplicitHeight = 0
         object splitter_hex_1: TSplitter
           Left = 0
Index: /oup/current/Tools/MetaEditor.pas
===================================================================
--- /oup/current/Tools/MetaEditor.pas	(revision 242)
+++ /oup/current/Tools/MetaEditor.pas	(revision 243)
@@ -264,4 +264,5 @@
   i: Integer;
   links: TStrings;
+  ifile: TFile;
 begin
   inherited;
@@ -279,14 +280,13 @@
         end;
       end;
-      if (data.Field is _MetaTypes.TDatLink) and (Column = 2) then
+      if data.Field is TFile then
       begin
-        links := nil;
-        links := ConManager.Connection[FConnectionID].GetFilesList(_MetaTypes.TDatLink(data.Field).PosExts, '', False, ST_NameAsc);
-        HintText := IntToStr(links.Count);
-        for i := 0 to Min(links.Count - 1, 99) do
-        begin
-          if (i mod 5) = 0 then
-            HintText := HintText + #13+#10;
-          HintText := HintText + links.Strings[i] + '       ';
+        ifile := TFile(data.Field);
+        case Column of
+          0: HintText :=
+            'FileID:    ' + IntToStr(ifile.FileInfo.ID) + #13#10 +
+            'Name:      ' + ifile.FileInfo.Name + #13#10 +
+            'Extension: ' + ifile.FileInfo.Extension + #13#10 +
+            '.dat-size: ' + IntToStr(ifile.FileInfo.Size) + #13#10;
         end;
       end;