diff --git a/eDos/Properties/licenses.licx b/eDos/Properties/licenses.licx
index 011746c..d60058f 100644
--- a/eDos/Properties/licenses.licx
+++ b/eDos/Properties/licenses.licx
@@ -1,3 +1,4 @@
+Telerik.Web.UI.RadComboBox, Telerik.Web.UI, Version=2022.3.913.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4
 Telerik.Web.UI.RadGrid, Telerik.Web.UI, Version=2022.2.622.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4
 Telerik.Web.UI.RadMultiPage, Telerik.Web.UI, Version=2022.2.622.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4
 Telerik.Web.UI.RadDataForm, Telerik.Web.UI, Version=2022.2.622.45, Culture=neutral, PublicKeyToken=121fae78165ba3d4
diff --git a/eDos/Rems/RemsUnitTaskPersonVisits.aspx b/eDos/Rems/RemsUnitTaskPersonVisits.aspx
index eef1454..c3d5aab 100644
--- a/eDos/Rems/RemsUnitTaskPersonVisits.aspx
+++ b/eDos/Rems/RemsUnitTaskPersonVisits.aspx
@@ -1,100 +1,57 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="RemsUnitTaskPersonVisits.aspx.cs" Inherits="eDos2021.Rems.RemsUnitTaskPersonVisits" %>
-<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
-    <div style="width: 100%;">
-        <telerik:RadComboBox ID="RadComboBox1" runat="server" Label="Unit" CssClass="FloatLeft" Width="200px" AutoPostBack="true">
-            <Items>
-                <telerik:RadComboBoxItem runat="server" Text="BR2" Value="2" />
-                <telerik:RadComboBoxItem runat="server" Text="BR3" Value="3" />
-            </Items>
-        </telerik:RadComboBox>
-        <telerik:RadDateInput ID="RadDateInput1" runat="server" Label=" Ingang vanaf:" CssClass="FloatLeft" Culture="nl-BE" DateFormat="yyyy-MM-dd HH:mm" DisplayDateFormat="yyyy-MM-dd HH:mm" SelectedDate="2014-01-01 00:00"  LabelWidth="80px" Width="200px" >
-        </telerik:RadDateInput>
-        <telerik:RadDateInput ID="RadDateInput2" runat="server" Label=" Tot:" CssClass="FloatLeft" Culture="nl-BE" DateFormat="yyyy-MM-dd HH:mm"  DisplayDateFormat="yyyy-MM-dd HH:mm"  SelectedDate="2014-01-10 23:59" AutoPostBack="true" LabelWidth="50px" Width="200px">
-        </telerik:RadDateInput>
-    </div>
-    <telerik:RadGrid ID="RadGrid1" runat="server" DataSourceID="SqlDSRems" AllowFilteringByColumn="True" AllowSorting="True" AutoGenerateColumns="False">
-<GroupingSettings CollapseAllTooltip="Collapse all groups"></GroupingSettings>
-
-        <ExportSettings ExportOnlyData="True" HideStructureColumns="True" IgnorePaging="True" FileName="RemsExport" OpenInNewWindow="True">
-            <Pdf PageWidth="" PaperSize="A4">
-            </Pdf>
-            <Excel Format="Xlsx" FileExtension="xlsx" />
-            <Csv EncloseDataWithQuotes="False" />
-        </ExportSettings>
-        <ValidationSettings EnableModelValidation="False" EnableValidation="False" />
-        <MasterTableView DataSourceID="SqlDSRems" CommandItemDisplay="Top">
-            <CommandItemSettings ShowAddNewRecordButton="False" ShowExportToExcelButton="True" />
-            <Columns>
-                <telerik:GridBoundColumn DataField="hpid" FilterControlAltText="Filter hpid column" HeaderText="hpid" SortExpression="hpid" UniqueName="hpid" FilterControlWidth="50px">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="persGroup" FilterControlAltText="Filter persGroup column" HeaderText="persGroup" SortExpression="persGroup" UniqueName="persGroup" FilterControlWidth="50px">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="unitinitials" FilterControlAltText="Filter unitinitials column" HeaderText="unitinitials" SortExpression="unitinitials" UniqueName="unitinitials" FilterControlWidth="50px">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="name" FilterControlAltText="Filter name column" HeaderText="name" ReadOnly="True" SortExpression="name" UniqueName="name" FilterControlWidth="175px">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="rwp" FilterControlAltText="Filter rwp column" HeaderText="rwp" ReadOnly="True" SortExpression="rwp" UniqueName="rwp" FilterControlWidth="50px">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="description" FilterControlAltText="Filter description column" HeaderText="description" SortExpression="description" UniqueName="description" FilterControlWidth="150px">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="entry_date_time" DataType="System.DateTime" FilterControlAltText="Filter entry_date_time column" HeaderText="entry_date_time" SortExpression="entry_date_time" UniqueName="entry_date_time" FilterControlWidth="100px" DataFormatString="{0:yyyy-MM-dd HH:mm}">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="exit_date_time" DataType="System.DateTime" FilterControlAltText="Filter exit_date_time column" HeaderText="exit_date_time" SortExpression="exit_date_time" UniqueName="exit_date_time" FilterControlWidth="100px" DataFormatString="{0:yyyy-MM-dd HH:mm}">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="hp_on_exit" DataType="System.Decimal" FilterControlAltText="Filter hp_on_exit column" HeaderText="hp_on_exit" SortExpression="hp_on_exit" UniqueName="hp_on_exit" FilterControlWidth="50px">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="hours" DataType="System.Decimal" FilterControlAltText="Filter hours column" HeaderText="hours" ReadOnly="True" SortExpression="hours" UniqueName="hours" FilterControlWidth="50px" >
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="hourstext" FilterControlAltText="Filter hourstext column" HeaderText="hourstext" ReadOnly="True" SortExpression="hourstext" UniqueName="hourstext" FilterControlWidth="50px">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-                <telerik:GridBoundColumn DataField="hourscumul" FilterControlAltText="Filter hourstext column" HeaderText="Cumul" ReadOnly="True" SortExpression="hourstext" UniqueName="hourscumul" FilterControlWidth="50px">
-                    <ColumnValidationSettings>
-                        <ModelErrorMessage Text="" />
-                    </ColumnValidationSettings>
-                </telerik:GridBoundColumn>
-            </Columns>
-        </MasterTableView>
-    </telerik:RadGrid>
-
-    <asp:SqlDataSource ID="SqlDSRems" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>" SelectCommand="ReportUnitPersDoseTaskVisit" SelectCommandType="StoredProcedure">
-        <SelectParameters>
-            <asp:ControlParameter ControlID="RadComboBox1" DefaultValue="3" Name="unit" PropertyName="SelectedValue" Type="Int32" />
-            <asp:ControlParameter ControlID="RadDateInput1" DefaultValue="2014-01-01" Name="mindate" PropertyName="SelectedDate" Type="DateTime" />
-            <asp:ControlParameter ControlID="RadDateInput2" DefaultValue="2014-01-31" Name="maxdate" PropertyName="SelectedDate" Type="DateTime" />
-        </SelectParameters>
-    </asp:SqlDataSource>
-</asp:Content>
-
+<%@ Page Title="eDos Tasks" Language="C#" MasterPageFile="~/Site.master" AutoEventWireup="true" CodeBehind="RemsUnitTaskPersonVisits.aspx.cs" Inherits="eDos2021.Rems.RemsUnitTaskPersonVisits" %>
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
+    <div style="width: 100%;">
+        <telerik:RadComboBox ID="RadComboBox1" runat="server" Label="Unit" CssClass="FloatLeft" Width="200px" AutoPostBack="true">
+            <Items>
+                <telerik:RadComboBoxItem runat="server" Text="BR2" Value="2" />
+                <telerik:RadComboBoxItem runat="server" Text="BR3" Value="3" />
+            </Items>
+        </telerik:RadComboBox>
+        <telerik:RadComboBox ID="cmbTasks" runat="server" Label="Task" CssClass="FloatLeft" Width="200px" AutoPostBack="true" DataSourceID="SqlDSTasks" DataTextField="text" DataValueField="value" />
+        <telerik:RadDateInput ID="RadDateInput1" runat="server" Label=" Ingang vanaf:" CssClass="FloatLeft" Culture="nl-BE" DateFormat="yyyy-MM-dd HH:mm" DisplayDateFormat="yyyy-MM-dd HH:mm" SelectedDate="2014-01-01 00:00"  LabelWidth="80px" Width="200px" />
+        <telerik:RadDateInput ID="RadDateInput2" runat="server" Label=" Tot:" CssClass="FloatLeft" Culture="nl-BE" DateFormat="yyyy-MM-dd HH:mm"  DisplayDateFormat="yyyy-MM-dd HH:mm"  SelectedDate="2014-01-10 23:59" AutoPostBack="true" LabelWidth="50px" Width="200px"/>
+    </div>
+    <telerik:RadGrid ID="RadGrid1" runat="server" DataSourceID="SqlDSRems" AllowFilteringByColumn="True" AllowSorting="True" AutoGenerateColumns="False">
+<GroupingSettings CollapseAllTooltip="Collapse all groups"></GroupingSettings>
+
+        <ExportSettings ExportOnlyData="True" HideStructureColumns="True" IgnorePaging="True" FileName="eDosTasks" OpenInNewWindow="True">
+            <Excel Format="Xlsx" FileExtension="xlsx" />
+        </ExportSettings>
+        <ValidationSettings EnableModelValidation="False" EnableValidation="False" />
+        <MasterTableView DataSourceID="SqlDSRems" CommandItemDisplay="Top">
+            <CommandItemSettings ShowAddNewRecordButton="False" ShowExportToExcelButton="True" />
+            <Columns>
+                <telerik:GridBoundColumn DataField="hpid" HeaderText="hpid" SortExpression="hpid" UniqueName="hpid" FilterControlWidth="50px" />
+                <telerik:GridBoundColumn DataField="persGroup" HeaderText="persGroup" SortExpression="persGroup" UniqueName="persGroup" FilterControlWidth="50px" />
+                <telerik:GridBoundColumn DataField="unitinitials" HeaderText="unitinitials" SortExpression="unitinitials" UniqueName="unitinitials" FilterControlWidth="50px" />
+                <telerik:GridBoundColumn DataField="name" HeaderText="name" ReadOnly="True" SortExpression="name" UniqueName="name" FilterControlWidth="175px" />
+                <telerik:GridBoundColumn DataField="rwp" HeaderText="rwp" ReadOnly="True" SortExpression="rwp" UniqueName="rwp" FilterControlWidth="50px" />
+                <telerik:GridBoundColumn DataField="description" HeaderText="description" SortExpression="description" UniqueName="description" FilterControlWidth="150px" />
+                <telerik:GridBoundColumn DataField="entry_date_time" DataType="System.DateTime" HeaderText="entry_date_time" SortExpression="entry_date_time" UniqueName="entry_date_time" FilterControlWidth="100px" DataFormatString="{0:yyyy-MM-dd HH:mm}" />
+                <telerik:GridBoundColumn DataField="exit_date_time" DataType="System.DateTime" HeaderText="exit_date_time" SortExpression="exit_date_time" UniqueName="exit_date_time" FilterControlWidth="100px" DataFormatString="{0:yyyy-MM-dd HH:mm}" />
+                <telerik:GridBoundColumn DataField="hp_on_exit" DataType="System.Decimal" HeaderText="hp_on_exit" SortExpression="hp_on_exit" UniqueName="hp_on_exit" FilterControlWidth="50px" />
+                <telerik:GridBoundColumn DataField="hours" DataType="System.Decimal" HeaderText="hours" ReadOnly="True" SortExpression="hours" UniqueName="hours" FilterControlWidth="50px"  />
+                <telerik:GridBoundColumn DataField="hourstext" HeaderText="hourstext" ReadOnly="True" SortExpression="hourstext" UniqueName="hourstext" FilterControlWidth="50px" />
+                <telerik:GridBoundColumn DataField="hourscumul" HeaderText="Cumul" ReadOnly="True" SortExpression="hourstext" UniqueName="hourscumul" FilterControlWidth="50px" />
+            </Columns>
+        </MasterTableView>
+    </telerik:RadGrid>
+
+    <asp:SqlDataSource ID="SqlDSRems" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>" SelectCommand="ReportUnitPersDoseTaskVisit" SelectCommandType="StoredProcedure" CancelSelectOnNullParameter="false">
+        <SelectParameters>
+            <asp:ControlParameter ControlID="RadComboBox1" DefaultValue="3" Name="unit" PropertyName="SelectedValue" Type="Int32" />
+            <asp:ControlParameter ControlID="RadDateInput1" DefaultValue="2014-01-01" Name="mindate" PropertyName="SelectedDate" Type="DateTime" />
+            <asp:ControlParameter ControlID="RadDateInput2" DefaultValue="2014-01-31" Name="maxdate" PropertyName="SelectedDate" Type="DateTime" />
+            <asp:ControlParameter ControlID="cmbTasks" DefaultValue="" Name="rwp" PropertyName="SelectedValue" Type="String" />
+        </SelectParameters>
+    </asp:SqlDataSource>
+
+    <asp:SqlDataSource ID="SqlDSTasks" runat="server" ConnectionString="<%$ ConnectionStrings:eDosConnectionString %>" SelectCommand="[dbo].[ReportUnitPersDoseTaskVisitTasks]" SelectCommandType="StoredProcedure">
+     <selectparameters>
+         <asp:ControlParameter ControlID="RadComboBox1" DefaultValue="3" Name="unit" PropertyName="SelectedValue" Type="Int32" />
+         <asp:ControlParameter ControlID="RadDateInput1" DefaultValue="2014-01-01" Name="mindate" PropertyName="SelectedDate" Type="DateTime" />
+         <asp:ControlParameter ControlID="RadDateInput2" DefaultValue="2014-01-31" Name="maxdate" PropertyName="SelectedDate" Type="DateTime" />
+     </selectparameters>
+    </asp:SqlDataSource>
+</asp:Content>
+
diff --git a/eDos/Rems/RemsUnitTaskPersonVisits.aspx.designer.cs b/eDos/Rems/RemsUnitTaskPersonVisits.aspx.designer.cs
index e965d30..9d30b0e 100644
--- a/eDos/Rems/RemsUnitTaskPersonVisits.aspx.designer.cs
+++ b/eDos/Rems/RemsUnitTaskPersonVisits.aspx.designer.cs
@@ -1,62 +1,80 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated. 
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace eDos2021.Rems
-{
-
-
-    public partial class RemsUnitTaskPersonVisits
-    {
-
-        /// <summary>
-        /// RadComboBox1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Telerik.Web.UI.RadComboBox RadComboBox1;
-
-        /// <summary>
-        /// RadDateInput1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Telerik.Web.UI.RadDateInput RadDateInput1;
-
-        /// <summary>
-        /// RadDateInput2 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Telerik.Web.UI.RadDateInput RadDateInput2;
-
-        /// <summary>
-        /// RadGrid1 control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::Telerik.Web.UI.RadGrid RadGrid1;
-
-        /// <summary>
-        /// SqlDSRems control.
-        /// </summary>
-        /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
-        /// </remarks>
-        protected global::System.Web.UI.WebControls.SqlDataSource SqlDSRems;
-    }
-}
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated. 
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace eDos2021.Rems
+{
+
+
+    public partial class RemsUnitTaskPersonVisits
+    {
+
+        /// <summary>
+        /// RadComboBox1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::Telerik.Web.UI.RadComboBox RadComboBox1;
+
+        /// <summary>
+        /// cmbTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::Telerik.Web.UI.RadComboBox cmbTasks;
+
+        /// <summary>
+        /// RadDateInput1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::Telerik.Web.UI.RadDateInput RadDateInput1;
+
+        /// <summary>
+        /// RadDateInput2 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::Telerik.Web.UI.RadDateInput RadDateInput2;
+
+        /// <summary>
+        /// RadGrid1 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::Telerik.Web.UI.RadGrid RadGrid1;
+
+        /// <summary>
+        /// SqlDSRems control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.SqlDataSource SqlDSRems;
+
+        /// <summary>
+        /// SqlDSTasks control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::System.Web.UI.WebControls.SqlDataSource SqlDSTasks;
+    }
+}
diff --git a/eDos/eDos.csproj.user b/eDos/eDos.csproj.user
index 54b9904..5e5c230 100644
--- a/eDos/eDos.csproj.user
+++ b/eDos/eDos.csproj.user
@@ -15,7 +15,7 @@
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <StartPageUrl>ClearErrorDose.aspx</StartPageUrl>
+          <StartPageUrl>Rems/RemsUnitTaskPersonVisits.aspx</StartPageUrl>
           <StartAction>SpecificPage</StartAction>
           <AspNetDebugging>True</AspNetDebugging>
           <SilverlightDebugging>False</SilverlightDebugging>
diff --git a/eDos/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/eDos/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 17b7f76..79b0238 100644
Binary files a/eDos/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/eDos/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ