diff --git a/ipsmanager/forms/frm_home.lfm b/ipsmanager/forms/frm_home.lfm
index 474986afe..bd40ec0aa 100644
--- a/ipsmanager/forms/frm_home.lfm
+++ b/ipsmanager/forms/frm_home.lfm
@@ -9,7 +9,7 @@ object IPSManagerForm: TIPSManagerForm
   Menu = MainMenu1
   OnCreate = FormCreate
   OnDestroy = FormDestroy
-  LCLVersion = '2.2.7.0'
+  LCLVersion = '3.0.0.2'
   object ToolBar1: TToolBar
     Left = 0
     Height = 74
diff --git a/server/fhirserver.lpi b/server/fhirserver.lpi
index 58f373838..a4fb66116 100644
--- a/server/fhirserver.lpi
+++ b/server/fhirserver.lpi
@@ -810,7 +810,7 @@
     </Other>
   </CompilerOptions>
   <Debugging>
-    <Exceptions Count="47">
+    <Exceptions Count="48">
       <Item1>
         <Name Value="EAbort"/>
       </Item1>
@@ -972,6 +972,9 @@
       <Item47>
         <Name Value="Edecompressionerror"/>
       </Item47>
+      <Item48>
+        <Name Value="EJsonParserException"/>
+      </Item48>
     </Exceptions>
   </Debugging>
 </CONFIG>
diff --git a/toolkit2/dialogs/frm_about.lfm b/toolkit2/dialogs/frm_about.lfm
index 517904fdb..0e31a8bae 100644
--- a/toolkit2/dialogs/frm_about.lfm
+++ b/toolkit2/dialogs/frm_about.lfm
@@ -10,7 +10,7 @@ object ToolkitAboutForm: TToolkitAboutForm
   ClientWidth = 530
   OnShow = FormShow
   Position = poOwnerFormCenter
-  LCLVersion = '2.3.0.0'
+  LCLVersion = '3.0.0.2'
   object Panel1: TPanel
     Left = 0
     Height = 223
@@ -21,6 +21,7 @@ object ToolkitAboutForm: TToolkitAboutForm
     ClientHeight = 223
     ClientWidth = 530
     Color = clWhite
+    ParentBackground = False
     ParentColor = False
     TabOrder = 0
     object Bevel2: TBevel
diff --git a/toolkit2/dialogs/frm_about.pas b/toolkit2/dialogs/frm_about.pas
index 8974eeebe..2893b60c0 100644
--- a/toolkit2/dialogs/frm_about.pas
+++ b/toolkit2/dialogs/frm_about.pas
@@ -91,6 +91,7 @@ procedure TToolkitAboutForm.FormShow(Sender: TObject);
 var
   dt : TFslDateTime;
   v : String;
+  cmd : TCommandLineParameters;
 begin
   v := TOOLKIT_VERSION;
   mInfo.Lines.clear;
@@ -109,8 +110,14 @@ procedure TToolkitAboutForm.FormShow(Sender: TObject);
   {$IFOPT D+}
   mInfo.Lines.Add('This is the debug version');
   {$ENDIF}
-  mInfo.Lines.add('Run as "'+commandLineAsString+'"');
-  mInfo.Lines.add('Host is '+SystemPlatform+' '+DescribeBytes(SystemMemory.physicalMem, true)+'/' + DescribeBytes(SystemMemory.virtualMem, true));
+
+  cmd := TCommandLineParameters.create;
+  try
+    mInfo.Lines.add('Run as "'+cmd.AsString+'"');
+    mInfo.Lines.add('Host is '+SystemPlatform+' '+DescribeBytes(SystemMemory.physicalMem, true)+'/' + DescribeBytes(SystemMemory.virtualMem, true));
+  finally
+    cmd.free;
+  end;
 end;
 
 end.
diff --git a/toolkit2/fhirtoolkit.lpi b/toolkit2/fhirtoolkit.lpi
index 1c4ea6b2c..9cd14e80f 100644
--- a/toolkit2/fhirtoolkit.lpi
+++ b/toolkit2/fhirtoolkit.lpi
@@ -34,7 +34,7 @@
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);..\library"/>
             <Libraries Value="..\dependencies\openssl\$(TargetOS)-$(TargetCPU)"/>
-            <OtherUnitFiles Value="editors;stores;views;frames;dialogs;tasks;..\ipsmanager\forms"/>
+            <OtherUnitFiles Value="editors;stores;views;frames;dialogs;tasks;..\ipsmanager\forms;..\ipsmanager\views"/>
             <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
@@ -87,7 +87,7 @@
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);..\library"/>
             <Libraries Value="..\dependencies\openssl\$(TargetOS)-$(TargetCPU)"/>
-            <OtherUnitFiles Value="editors;stores;views;frames;dialogs;tasks;..\ipsmanager\forms"/>
+            <OtherUnitFiles Value="editors;stores;views;frames;dialogs;tasks;..\ipsmanager\forms;..\ipsmanager\views"/>
             <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
@@ -140,7 +140,7 @@
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);..\library"/>
             <Libraries Value="..\dependencies\openssl\$(TargetOS)-$(TargetCPU)"/>
-            <OtherUnitFiles Value="editors;stores;views;frames;dialogs;tasks;..\ipsmanager\forms"/>
+            <OtherUnitFiles Value="editors;stores;views;frames;dialogs;tasks;..\ipsmanager\forms;..\ipsmanager\views"/>
             <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
@@ -192,7 +192,7 @@
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);..\library"/>
             <Libraries Value="..\dependencies\openssl\$(TargetOS)-$(TargetCPU)"/>
-            <OtherUnitFiles Value="editors;stores;views;frames;dialogs;tasks;..\ipsmanager\forms"/>
+            <OtherUnitFiles Value="editors;stores;views;frames;dialogs;tasks;..\ipsmanager\forms;..\ipsmanager\views"/>
             <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
@@ -250,7 +250,7 @@
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);..\library"/>
             <Libraries Value="..\dependencies\openssl\$(TargetOS)-$(TargetCPU)"/>
-            <OtherUnitFiles Value="editors;stores;views;frames;dialogs;tasks;..\ipsmanager\forms"/>
+            <OtherUnitFiles Value="editors;stores;views;frames;dialogs;tasks;..\ipsmanager\forms;..\ipsmanager\views"/>
             <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
@@ -301,7 +301,7 @@
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);..\library"/>
             <Libraries Value="..\dependencies\openssl\$(TargetOS)-$(TargetCPU)"/>
-            <OtherUnitFiles Value="editors;stores;views;frames;dialogs;tasks;..\ipsmanager\forms"/>
+            <OtherUnitFiles Value="editors;stores;views;frames;dialogs;tasks;..\ipsmanager\forms;..\ipsmanager\views"/>
             <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <CodeGeneration>
@@ -347,7 +347,7 @@
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);..\library"/>
             <Libraries Value="..\dependencies\openssl\$(TargetOS)-$(TargetCPU)"/>
-            <OtherUnitFiles Value="editors;stores;views;frames;dialogs;tasks;..\ipsmanager\forms"/>
+            <OtherUnitFiles Value="editors;stores;views;frames;dialogs;tasks;..\ipsmanager\forms;..\ipsmanager\views"/>
             <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <CodeGeneration>
@@ -393,7 +393,7 @@
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir);..\library"/>
             <Libraries Value="..\dependencies\openssl\$(TargetOS)-$(TargetCPU)"/>
-            <OtherUnitFiles Value="editors;stores;views;frames;dialogs;tasks;..\ipsmanager\forms"/>
+            <OtherUnitFiles Value="editors;stores;views;frames;dialogs;tasks;..\ipsmanager\forms;..\ipsmanager\views"/>
             <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <CodeGeneration>
@@ -831,6 +831,16 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit>
+      <Unit>
+        <Filename Value="..\ipsmanager\views\mvbase.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="mvBase"/>
+      </Unit>
+      <Unit>
+        <Filename Value="..\ipsmanager\views\mvdatasources.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="mvDataSources"/>
+      </Unit>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
@@ -842,7 +852,7 @@
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir);..\library"/>
       <Libraries Value="..\dependencies\openssl\$(TargetOS)-$(TargetCPU)"/>
-      <OtherUnitFiles Value="editors;stores;views;frames;dialogs;tasks;..\ipsmanager\forms"/>
+      <OtherUnitFiles Value="editors;stores;views;frames;dialogs;tasks;..\ipsmanager\forms;..\ipsmanager\views"/>
       <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
diff --git a/toolkit2/fhirtoolkit.lpr b/toolkit2/fhirtoolkit.lpr
index 8bfe61e4f..20c3af7db 100644
--- a/toolkit2/fhirtoolkit.lpr
+++ b/toolkit2/fhirtoolkit.lpr
@@ -30,7 +30,7 @@
   ftk_image_scanner, ftk_worker_home, dlg_open_url, ftk_store_http, dlg_scanner,
   dlg_upgrade, ftk_engine_igpub, dlg_igpub_config, dlg_igpub_github,
   ftk_engine_text, ftk_text_view, dlg_ig_upload, dlg_server_upload,
-  dlg_txsrvr_props, dlg_gender_identity, frm_home;
+  dlg_txsrvr_props, dlg_gender_identity, frm_home, mvDataSources, mvBase;
 
 {$R *.res}