diff --git a/apps/emqx/src/emqx_session_router.erl b/apps/emqx/src/emqx_session_router.erl
index 94f7fb64d..0d4972e8c 100644
--- a/apps/emqx/src/emqx_session_router.erl
+++ b/apps/emqx/src/emqx_session_router.erl
@@ -71,24 +71,15 @@
 %%--------------------------------------------------------------------
 
 create_router_tab(disc) ->
-    ok = mria:create_table(?ROUTE_DISC_TAB, [
-        {type, bag},
-        {rlog_shard, ?ROUTE_SHARD},
-        {storage, disc_copies},
-        {record_name, route},
-        {attributes, record_info(fields, route)},
-        {storage_properties, [
-            {ets, [
-                {read_concurrency, true},
-                {write_concurrency, true}
-            ]}
-        ]}
-    ]);
+    create_table(?ROUTE_DISC_TAB, disc_copies);
 create_router_tab(ram) ->
-    ok = mria:create_table(?ROUTE_RAM_TAB, [
+    create_table(?ROUTE_RAM_TAB, ram_copies).
+
+create_table(Tab, Storage) ->
+    ok = mria:create_table(Tab, [
         {type, bag},
         {rlog_shard, ?ROUTE_SHARD},
-        {storage, ram_copies},
+        {storage, Storage},
         {record_name, route},
         {attributes, record_info(fields, route)},
         {storage_properties, [
diff --git a/apps/emqx_rule_engine/src/emqx_rule_date.erl b/apps/emqx_rule_engine/src/emqx_rule_date.erl
index a41beb20d..aeb5d7a1b 100644
--- a/apps/emqx_rule_engine/src/emqx_rule_date.erl
+++ b/apps/emqx_rule_engine/src/emqx_rule_date.erl
@@ -88,20 +88,20 @@ parse_date(TimeUnit, Offset, FormatString, InputString) ->
     calendar:rfc3339_to_system_time(Str, [{unit, TimeUnit}]).
 
 mlist(R) ->
-    %% %H	Shows hour in 24-hour format [15]
+    %%    %H     Shows hour in 24-hour format [15]
     [
         {$H, R#result.hour},
-        %% %M	Displays minutes [00-59]
+        %%    %M    Displays minutes [00-59]
         {$M, R#result.minute},
-        %% %S	Displays seconds [00-59]
+        %%    %S    Displays seconds [00-59]
         {$S, R#result.second},
-        %% %y	Displays year YYYY [2021]
+        %%    %y    Displays year YYYY [2021]
         {$y, R#result.year},
-        %% %m	Displays the number of the month [01-12]
+        %%    %m    Displays the number of the month [01-12]
         {$m, R#result.month},
-        %% %d	Displays the number of the month [01-12]
+        %%    %d    Displays the number of the month [01-12]
         {$d, R#result.day},
-        %% %Z	Displays Time zone
+        %%    %Z    Displays Time zone
         {$Z, R#result.zone}
     ].
 
@@ -223,20 +223,20 @@ parse_zone(Input) ->
 
 mlist1() ->
     maps:from_list(
-        %% %H	Shows hour in 24-hour format [15]
+        %%    %H     Shows hour in 24-hour format [15]
         [
             {$H, fun(Input) -> parse_int_times(2, Input) end},
-            %% %M	Displays minutes [00-59]
+            %%    %M    Displays minutes [00-59]
             {$M, fun(Input) -> parse_int_times(2, Input) end},
-            %% %S	Displays seconds [00-59]
+            %%    %S    Displays seconds [00-59]
             {$S, fun(Input) -> parse_second(Input) end},
-            %% %y	Displays year YYYY [2021]
+            %%    %y    Displays year YYYY [2021]
             {$y, fun(Input) -> parse_int_times(4, Input) end},
-            %% %m	Displays the number of the month [01-12]
+            %%    %m    Displays the number of the month [01-12]
             {$m, fun(Input) -> parse_int_times(2, Input) end},
-            %% %d	Displays the number of the month [01-12]
+            %%    %d    Displays the number of the month [01-12]
             {$d, fun(Input) -> parse_int_times(2, Input) end},
-            %% %Z	Displays Time zone
+            %%    %Z    Displays Time zone
             {$Z, fun(Input) -> parse_zone(Input) end}
         ]
     ).
diff --git a/deploy/charts/emqx/Chart.yaml b/deploy/charts/emqx/Chart.yaml
index 2be2a6324..ae48f9de2 100644
--- a/deploy/charts/emqx/Chart.yaml
+++ b/deploy/charts/emqx/Chart.yaml
@@ -14,8 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 5.0.13
+version: 5.0.14
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 5.0.13
+appVersion: 5.0.14