diff --git a/components/rx/trunk/Demos/RxDBGrid_Filter/ZEOS/project1.lpi b/components/rx/trunk/Demos/RxDBGrid_Filter/ZEOS/project1.lpi
index 6f1045e16..006fc3ea1 100644
--- a/components/rx/trunk/Demos/RxDBGrid_Filter/ZEOS/project1.lpi
+++ b/components/rx/trunk/Demos/RxDBGrid_Filter/ZEOS/project1.lpi
@@ -10,9 +10,6 @@
       <UseXPManifest Value="True"/>
       <Icon Value="0"/>
     </General>
-    <VersionInfo>
-      <StringTable ProductVersion=""/>
-    </VersionInfo>
     <BuildModes Count="1">
       <Item1 Name="Default" Default="True"/>
     </BuildModes>
@@ -50,6 +47,7 @@
         <Filename Value="unit1.pas"/>
         <IsPartOfProject Value="True"/>
         <ComponentName Value="Form1"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit1"/>
       </Unit1>
diff --git a/components/rx/trunk/Demos/RxDBGrid_Filter/ZEOS/project1.lps b/components/rx/trunk/Demos/RxDBGrid_Filter/ZEOS/project1.lps
index a7887ffa0..0b7b59cae 100644
--- a/components/rx/trunk/Demos/RxDBGrid_Filter/ZEOS/project1.lps
+++ b/components/rx/trunk/Demos/RxDBGrid_Filter/ZEOS/project1.lps
@@ -28,20 +28,25 @@
       </Unit1>
       <Unit2>
         <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="995"/>
+        <TopLine Value="4301"/>
+        <CursorPos X="3" Y="4266"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit2>
       <Unit3>
         <Filename Value="../../../rxdb/rxdbgrid_popupfilterunit.pas"/>
+        <ComponentName Value="RxDBGrid_PopUpFilterForm"/>
+        <HasResources Value="True"/>
+        <ResourceBaseClass Value="Form"/>
         <UnitName Value="RxDBGrid_PopUpFilterUnit"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="2"/>
         <TopLine Value="166"/>
         <CursorPos X="36" Y="177"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
+        <LoadedDesigner Value="True"/>
       </Unit3>
       <Unit4>
         <Filename Value="../../../rxdb/rxlookup.pas"/>
@@ -49,7 +54,7 @@
         <UsageCount Value="10"/>
       </Unit4>
     </Units>
-    <JumpHistory Count="9" HistoryIndex="8">
+    <JumpHistory Count="11" HistoryIndex="10">
       <Position1>
         <Filename Value="unit1.pas"/>
       </Position1>
@@ -83,8 +88,16 @@
       </Position8>
       <Position9>
         <Filename Value="../../../rxdb/rxdbgrid.pas"/>
-        <Caret TopLine="995"/>
+        <Caret Line="758" Column="9" TopLine="743"/>
       </Position9>
+      <Position10>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="4170" Column="3" TopLine="4209"/>
+      </Position10>
+      <Position11>
+        <Filename Value="../../../rxdb/rxdbgrid.pas"/>
+        <Caret Line="760" Column="15" TopLine="745"/>
+      </Position11>
     </JumpHistory>
   </ProjectSession>
 </CONFIG>
diff --git a/components/rx/trunk/Demos/RxDBGrid_Filter/ZEOS/unit1.lfm b/components/rx/trunk/Demos/RxDBGrid_Filter/ZEOS/unit1.lfm
index b6841843c..2ff14779f 100644
--- a/components/rx/trunk/Demos/RxDBGrid_Filter/ZEOS/unit1.lfm
+++ b/components/rx/trunk/Demos/RxDBGrid_Filter/ZEOS/unit1.lfm
@@ -14,13 +14,13 @@ object Form1: TForm1
     Top = 0
     Width = 741
     ColumnDefValues.BlobText = '(данные)'
-    TitleButtons = False
+    TitleButtons = True
     AutoSort = True
     Columns = <    
       item
         Title.Alignment = taCenter
         Title.Orientation = toHorizontal
-        Title.Caption = 'DEPT_NO'
+        Title.Caption = 'DEP|DEPT_NO'
         Width = 70
         FieldName = 'DEPT_NO'
         EditButtons = <>
@@ -34,7 +34,7 @@ object Form1: TForm1
       item
         Title.Alignment = taCenter
         Title.Orientation = toHorizontal
-        Title.Caption = 'DEPARTMENT'
+        Title.Caption = 'DEP|DEPARTMENT'
         Width = 250
         FieldName = 'DEPARTMENT'
         EditButtons = <>
@@ -127,7 +127,7 @@ object Form1: TForm1
     SelectedColor = clHighlight
     GridLineStyle = psSolid
     DataSource = DataSource1
-    Options = [dgEditing, dgTitles, dgIndicator, dgColumnResize, dgColumnMove, dgColLines, dgRowLines, dgAlwaysShowSelection, dgConfirmDelete, dgCancelOnExit]
+    Options = [dgEditing, dgTitles, dgIndicator, dgColumnResize, dgColumnMove, dgColLines, dgRowLines, dgAlwaysShowSelection, dgConfirmDelete, dgCancelOnExit, dgHeaderPushedLook]
     ParentColor = False
     ReadOnly = True
     TabOrder = 0
diff --git a/components/rx/trunk/rxdb/rxpopupunit.pas b/components/rx/trunk/rxdb/rxpopupunit.pas
index a901b8059..5b25abab6 100644
--- a/components/rx/trunk/rxdb/rxpopupunit.pas
+++ b/components/rx/trunk/rxdb/rxpopupunit.pas
@@ -396,7 +396,8 @@ end;
 procedure TPopUpForm.CreateWnd;
 begin
   inherited CreateWnd;
-  Height:=FGrid.DefaultRowHeight * FRowCount;
+  //Height:=FGrid.DefaultRowHeight * FRowCount;
+  Height:=FGrid.GetDefaultRowHeight * FRowCount;
 end;
 
 procedure TPopUpForm.DoSetFieldsFromString(FL: string);
@@ -420,6 +421,7 @@ begin
     end;
     GK:=FGrid.Columns.Add as TRxColumn;
     GK.Field:=FGrid.DataSource.DataSet.FieldByName(FieldName);
+    GK.Width:=-1;
   end;
 end;