diff --git a/zanata-war/src/main/java/org/zanata/rest/service/DateRange.java b/zanata-war/src/main/java/org/zanata/rest/service/DateRange.java
index 3615188cbe..93bd5dc8cb 100644
--- a/zanata-war/src/main/java/org/zanata/rest/service/DateRange.java
+++ b/zanata-war/src/main/java/org/zanata/rest/service/DateRange.java
@@ -38,14 +38,12 @@ static DateRange from(String dateRangeParam, String fromTimezoneId) {
         if (dateRange.length != 2) {
             throw new InvalidDateParamException(dateRangeParam);
         }
-        // here we use java util timezone first because it supports more short IDs
         DateTimeZone zone;
         if (fromTimezoneId == null) {
             zone = DateTimeZone.getDefault();
         } else {
             try {
-                zone =
-                        DateTimeZone.forTimeZone(TimeZone.getTimeZone(fromTimezoneId));
+                zone = DateTimeZone.forID(fromTimezoneId);
             } catch (IllegalArgumentException e) {
                 throw new BadRequestException("Invalid timezone ID:" + fromTimezoneId);
             }
diff --git a/zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml b/zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
index e1d963bde8..65c70a7f06 100644
--- a/zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
+++ b/zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
@@ -48,6 +48,16 @@
     </createIndex>
   </changeSet>
 
+  <changeSet id="3" author="pahuang@redhat.com">
+    <comment>add indexes to HTextFlowTargetHistory and HTextFlowTarget table</comment>
+    <createIndex tableName="HTextFlowTargetHistory" indexName="Idx_lastModifiedBy">
+      <column name="last_modified_by_id"/>
+    </createIndex>
+    <createIndex tableName="HTextFlowTarget" indexName="Idx_lastModifiedBy">
+      <column name="last_modified_by_id"/>
+    </createIndex>
+  </changeSet>
+
   <changeSet id="3" author="aeng@redhat.com">
     <comment>Add revisionComment to HTextFlowTarget, HTextFlowTargetHistory</comment>
     <addColumn tableName="HTextFlowTarget">