diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9333e009e9..2316e1a558 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,17 +43,20 @@ ChangeLog
 - **New(filter-control):** Added `showFilterControlSwitch` option.
 - **New(fixed-columns):** Added support for sticky-header.
 - **New(pipeline):** Added `pipeline` extension.
+- **New(print):** Added support for print footer and merge cells.
 - **Update(accent-neutralise):** Fixed comparison with arrays.
 - **Update(cookie):** Updated cookie columns to always visible when `switchable` is `false`.
 - **Update(cookie):** Fixed cookie value from existing options bug.
 - **Update(editable):** Fixed not handle quotation marks bug.
 - **Update(editable):** Updated `noeditFormatter` to `noEditFormatter`.
 - **Update(export):** Fixed export error with `maintainMetaData` and `clientSidePagination`.
-- **Update(filter-control):** Fixed not Working in multiple tables.
+- **Update(filter-control):** Fixed not work with `height` option.
+- **Update(filter-control):** Fixed not work in multiple tables.
 - **Update(filter-control):** Fixed ignore default search text bug.
 - **Update(filter-control):** Fixed not work with html formatter.
 - **Update(filter-control):** Fixed reset `filterBy` method bug.
 - **Update(filter-control):** Fixed issue with a custom filter control container.
+- **Update(filter-control):** Fixed filter control disappear after column switched.
 - **Update(fixed-columns):** Fixed loading message not hide bug.
 - **Update(group-by):** Fixed params error of `checkAll`/`uncheckAll`.
 - **Update(multiple-sort):** Fixed not working with multiple level field bug.
diff --git a/site/docs/api/events.md b/site/docs/api/events.md
index e864f29942..0a6a31d52f 100644
--- a/site/docs/api/events.md
+++ b/site/docs/api/events.md
@@ -294,7 +294,7 @@ $('#table').on('event-name.bs.table', function (e, arg1, arg2, ...) {
 
 - **jQuery Event:** `scroll-body.bs.table`
 
-- **Parameter:**: `$tableBody`
+- **Parameter:** `$tableBody`
 
 - **Detail:**
 
diff --git a/src/bootstrap-table.js b/src/bootstrap-table.js
index 7c4f916815..2d3022c987 100644
--- a/src/bootstrap-table.js
+++ b/src/bootstrap-table.js
@@ -2849,7 +2849,7 @@ class BootstrapTable {
       options = Object.assign(options, params)
     } else if (typeof params === 'string' && params === 'bottom') {
       options.value = this.$tableBody[0].scrollHeight
-    } else if (typeof params === 'string') {
+    } else if (typeof params === 'string' || typeof params === 'number') {
       options.value = params
     }