diff --git a/doc/guide/api.xml b/doc/guide/api.xml
index fbc1aa9b8f..71eb263d28 100644
--- a/doc/guide/api.xml
+++ b/doc/guide/api.xml
@@ -2521,7 +2521,7 @@ object appear only if specific field is set.</para>
 
 <!-- start of reservation-get-all -->
 <section xml:id="reference-reservation-get-all">
-<title>reservation-get reference</title>
+<title>reservation-get-all reference</title>
 <para xml:id="ref-reservation-get-all"><command>reservation-get-all</command> - Retrieve all host reservations for a specified subnet.</para>
 
 <para>Supported by: <command><link linkend="commands-kea-dhcp4">kea-dhcp4</link></command>, <command><link linkend="commands-kea-dhcp6">kea-dhcp6</link></command></para>
@@ -2576,7 +2576,7 @@ The reservation-get-all command may result in very large responses.</para>
 
 <!-- start of reservation-get-page -->
 <section xml:id="reference-reservation-get-page">
-<title>reservation-get reference</title>
+<title>reservation-get-page reference</title>
 <para xml:id="ref-reservation-get-page"><command>reservation-get-page</command> - Retrieve all host reservations for a specified subnet by pages.</para>
 
 <para>Supported by: <command><link linkend="commands-kea-dhcp4">kea-dhcp4</link></command>, <command><link linkend="commands-kea-dhcp6">kea-dhcp6</link></command></para>
diff --git a/doc/guide/hooks.xml b/doc/guide/hooks.xml
index 836c33a8dd..c3e340cfe1 100644
--- a/doc/guide/hooks.xml
+++ b/doc/guide/hooks.xml
@@ -1672,6 +1672,9 @@ An example result returned when the query was malformed:<screen>
           For larger deployments, please consider using
           <command>reservation-get-page</command> instead (see <xref
           linkend="command-reservation-get-page"/>).
+          </para>
+          
+          <para>
           For a reference, see <xref linkend="ref-reservation-get-all"/>.
           </para>
         </section>
@@ -1692,7 +1695,7 @@ An example result returned when the query was malformed:<screen>
           <para>The first page is queried without source-index and from,
           for next pages source-index and from should be set using
           the preceeding result source-index and next. After the last page
-          the returned list is empty and result 3 is returned.
+          the returned list is empty, count is 0 and result 3 is returned.
           </para>
 
           <para>This command is more complex than
@@ -1702,7 +1705,9 @@ An example result returned when the query was malformed:<screen>
           easier to use <command>reservation-get-all</command> (see
           <xref linkend="command-reservation-get-all"/>.</para>
 
-          <para>For a reference, see <xref linkend="ref-reservation-get-page"/>.</para>
+          <para>
+          For a reference, see <xref linkend="ref-reservation-get-page"/>.
+          </para>
         </section>
 
         <section xml:id="command-reservation-del">
diff --git a/src/lib/dhcpsrv/pgsql_host_data_source.cc b/src/lib/dhcpsrv/pgsql_host_data_source.cc
index e1ddb9c110..f92142398e 100644
--- a/src/lib/dhcpsrv/pgsql_host_data_source.cc
+++ b/src/lib/dhcpsrv/pgsql_host_data_source.cc
@@ -1772,8 +1772,8 @@ TaggedStatementArray tagged_statements = { {
     // PgSqlHostDataSourceImpl::GET_HOST_SUBID4_PAGE
     // Retrieves host information along with the DHCPv4 options associated with
     // it. Left joining the dhcp4_options table results in multiple rows being
-    // returned for the same host. The hosts are retrieved by subnet id, starting
-    // from specified host id. Specified number of hosts is returned.
+    // returned for the same host. The hosts are retrieved by subnet id,
+    // starting from specified host id. Specified number of hosts is returned.
     {3,
      { OID_INT8, OID_INT8, OID_INT8 },
      "get_host_subid4_page",