diff --git a/public/.htaccess b/public/.htaccess
new file mode 100644
index 0000000..c4d6249
--- /dev/null
+++ b/public/.htaccess
@@ -0,0 +1,21 @@
+RewriteEngine on
+RewriteBase /
+RewriteRule ^index\.html$ - [L]
+
+RewriteCond %{QUERY_STRING} (^|&)index_id=([0-9]+)($|&)
+RewriteRule ^modules/xoonips/listitem.php /database/list/%2? [L,R=301]
+
+RewriteCond %{QUERY_STRING} (^|&)item_id=([0-9]+)($|&)
+RewriteRule ^modules/xoonips/detail.php /database/item/%2? [L,R=301]
+
+RewriteCond %{QUERY_STRING} (^|&)id=([^&]+)($|&)
+RewriteRule ^modules/xoonips/detail.php /database/item/id/%2? [L,R=301]
+
+RewriteCond %{QUERY_STRING} (^|&)file_id=([^&]+)($|&)
+RewriteRule ^modules/xoonips/download.php /database/file/%2? [L,R=301]
+
+RewriteRule ^modules/xoonips/advanced_search.php /database/advanced? [L,R=301]
+
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule . /index.html [L]
diff --git a/src/components/database/item-type/lib/field/RelatedTo.tsx b/src/components/database/item-type/lib/field/RelatedTo.tsx
index 6fc702e..504af73 100644
--- a/src/components/database/item-type/lib/field/RelatedTo.tsx
+++ b/src/components/database/item-type/lib/field/RelatedTo.tsx
@@ -35,16 +35,18 @@ class RelatedTo extends Component<Props, State> {
     updateElements(relatedTo: number[]) {
         let evenodd = 'even';
         let elements: JSX.Element[] = [];
-        relatedTo.forEach((itemId) => {
-            ItemUtil.get(itemId, (item) => {
+        relatedTo.forEach(async (itemId, i) => {
+            await ItemUtil.get(itemId, (item) => {
                 if (item === null) {
                     return;
                 }
                 evenodd = evenodd === 'even' ? 'odd' : 'even';
                 elements.push(<tr key={itemId}><td className={evenodd}><ItemType.List item={item} /></td></tr>);
             });
+            if (i + 1 === relatedTo.length) {
+                this.setState({ elements });
+            }
         });
-        this.setState({ elements });    
     }
 
     render() {
diff --git a/src/components/database/lib/DatabaseListItem.tsx b/src/components/database/lib/DatabaseListItem.tsx
index 1e7f444..aae16b5 100644
--- a/src/components/database/lib/DatabaseListItem.tsx
+++ b/src/components/database/lib/DatabaseListItem.tsx
@@ -203,7 +203,7 @@ class DatabaseListItem extends Component<Props, State> {
         return (
             <>
                 {this.renderSortCriteria()}
-                <p>{startNum} - {endNum} of {result.total}</p>
+                <p>{startNum} - {endNum} of {result.total} Items</p>
                 {pageNavi}
                 <table className="listTable">
                     <tbody>