Index: VerpakkingsDefinitie/UI/Subscherm.pas
===================================================================
diff -u -r556 -r557
--- VerpakkingsDefinitie/UI/Subscherm.pas	(.../Subscherm.pas)	(revision 556)
+++ VerpakkingsDefinitie/UI/Subscherm.pas	(.../Subscherm.pas)	(revision 557)
@@ -19,7 +19,7 @@
     property Navigator: TFormMain Read FNavigator write FNavigator;
     property ApplicationContext: TApplicationContext Read FApplicationContext write FApplicationContext;
   public
-    Constructor Create(AOwner: TComponent; Navigator: TFormMain; ApplicationContext: TApplicationContext); overload;
+    Constructor Create(AOwner: TComponent; Navigator: TFormMain; ApplicationContext: TApplicationContext);
   end;
 
 implementation
Index: VerpakkingsDefinitie/WS/ProductsAgent.pas
===================================================================
diff -u -r556 -r557
--- VerpakkingsDefinitie/WS/ProductsAgent.pas	(.../ProductsAgent.pas)	(revision 556)
+++ VerpakkingsDefinitie/WS/ProductsAgent.pas	(.../ProductsAgent.pas)	(revision 557)
@@ -13,7 +13,7 @@
   KORTTEKST_FORMAT_EXPAND = 'KortTekst;IdentNr;StockType;LangTekstN';
 
 type
-  TProductAgent = class
+  TProductsAgent = class
   private
     FProdSelectServerSoap: SelectService.ProdSelectServerSoap;
     procedure RegistreerZoekresultaten(ProductsContext: TProductsContext; DataSet: anyType);
@@ -26,20 +26,19 @@
 
 implementation
 
-constructor TProductAgent.Create();
+constructor TProductsAgent.Create();
 begin
   FProdSelectServerSoap := SelectService.GetProdSelectServerSoap(false, PROD_SERVER_URL, nil);
 end;
 
-procedure TProductAgent.ZoekOpMetKortTekst(Zoek: string; KLNr: string; At: string; UserContext: TUserContext;
+procedure TProductsAgent.ZoekOpMetKortTekst(Zoek: string; KLNr: string; At: string; UserContext: TUserContext;
   ProductsContext: TProductsContext);
 var
   ZoekData: SelectService.Select;
   ZoekCriteria: SelectService.pxSelectCriteria; // Property van ZoekData
   SelectResponseObj: SelectService.SelectResponse;
 begin
   ZoekData := nil;
-  ZoekCriteria := nil;
   SelectResponseObj := nil;
   try
     // Request
@@ -72,7 +71,7 @@
   end;
 end;
 
-procedure TProductAgent.RegistreerZoekresultaten(ProductsContext: TProductsContext; DataSet: anyType);
+procedure TProductsAgent.RegistreerZoekresultaten(ProductsContext: TProductsContext; DataSet: anyType);
 begin
   // Andere velden juist zetten
   ProductsContext.IsOK := True;
@@ -84,7 +83,7 @@
   ProductsContext.NotifyChanged();
 end;
 
-procedure TProductAgent.RegistreerMislukteOpzoeking(ProductsContext: TProductsContext; pxStatusObj: pxStatus);
+procedure TProductsAgent.RegistreerMislukteOpzoeking(ProductsContext: TProductsContext; pxStatusObj: pxStatus);
 begin
   // Ander velden leegmaken
   ProductsContext.DataSet := nil;
Index: VerpakkingsDefinitie/Main.pas
===================================================================
diff -u -r556 -r557
--- VerpakkingsDefinitie/Main.pas	(.../Main.pas)	(revision 556)
+++ VerpakkingsDefinitie/Main.pas	(.../Main.pas)	(revision 557)
@@ -7,7 +7,7 @@
   Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants,
   System.Classes, Vcl.Graphics,
   Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.ExtCtrls, Vcl.StdCtrls,
-  ApplicationContext, UserAgent, ProductAgent;
+  ApplicationContext, UserAgent, ProductsAgent;
 
 const
   NAVHOME = 0;
@@ -22,7 +22,7 @@
   private
     FAppContext: TApplicationContext;
     FUserAgent: TUserAgent;
-    FProductAgent: TProductAgent;
+    FProductAgent: TProductsAgent;
     procedure FreeControlChildrenRec(AControl: TControl);
     procedure ConfigureerLayoutGridPanel(GridPanel: TGridPanel);
     procedure PlaatsControlOpGrid(GridPanel: TGridPanel; Control: TControl; RowI: Integer; ColI: Integer; RowSpan: Integer = 1;
@@ -51,7 +51,7 @@
 begin
   FAppContext := TApplicationContext.Create();
   FUserAgent := TUserAgent.Create();
-  FProductAgent := TProductAgent.Create();
+  FProductAgent := TProductsAgent.Create();
   { TODO -cMain: Wat doet dit in de originele applicatie?: fUiContext.ImagesScherm := TImagesScherm.Create(self); }
   { TODO -cMain: Kijken of "VerwerkParamStrings;" nodig is }
   PanelMain.Parent := Self;
Index: VerpakkingsDefinitie/UI/ZoekProductenScherm.pas
===================================================================
diff -u -r556 -r557
--- VerpakkingsDefinitie/UI/ZoekProductenScherm.pas	(.../ZoekProductenScherm.pas)	(revision 556)
+++ VerpakkingsDefinitie/UI/ZoekProductenScherm.pas	(.../ZoekProductenScherm.pas)	(revision 557)
@@ -8,7 +8,7 @@
   Vcl.Controls, Vcl.Forms, Vcl.Dialogs,
   Vcl.ComCtrls, Vcl.StdCtrls,
   Subscherm, Main,
-  ApplicationContext, ProductAgent;
+  ApplicationContext, ProductsAgent;
 
 type
   TFormZoekProducten = class(TFormSubscherm)
@@ -28,18 +28,18 @@
     procedure ButtonZoekViaKortTekstClick(Sender: TObject);
     procedure EditZoekChange(Sender: TObject);
   private
-    FProductAgent: TProductAgent;
+    FProductAgent: TProductsAgent;
   public
     Constructor Create(AOwner: TComponent; Navigator: TFormMain; ApplicationContext: TApplicationContext;
-      ProductAgent: TProductAgent);
+      ProductAgent: TProductsAgent);
   end;
 
 implementation
 
 {$R *.dfm}
 
 constructor TFormZoekProducten.Create(AOwner: TComponent; Navigator: TFormMain; ApplicationContext: TApplicationContext;
-  ProductAgent: TProductAgent);
+  ProductAgent: TProductsAgent);
 begin
   inherited Create(AOwner, Navigator, ApplicationContext);
   self.FProductAgent := ProductAgent;
Index: VerpakkingsDefinitie/UI/ZoekProductenScherm.dfm
===================================================================
diff -u -r556 -r557
--- VerpakkingsDefinitie/UI/ZoekProductenScherm.dfm	(.../ZoekProductenScherm.dfm)	(revision 556)
+++ VerpakkingsDefinitie/UI/ZoekProductenScherm.dfm	(.../ZoekProductenScherm.dfm)	(revision 557)
@@ -84,18 +84,34 @@
     object TabSheetIdentificatieNr: TTabSheet
       Caption = 'Identificatie nr'
       ImageIndex = 1
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
     end
     object TabSheetLeveranciersRef: TTabSheet
       Caption = 'Leveranciers ref'
       ImageIndex = 2
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
     end
     object TabSheetTekst: TTabSheet
       Caption = 'Tekst'
       ImageIndex = 3
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
     end
     object TabSheetProductboom: TTabSheet
       Caption = 'Productboom'
       ImageIndex = 4
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 0
+      ExplicitHeight = 0
     end
   end
 end