diff --git a/Cargo.lock b/Cargo.lock
index 6b08729..021f9ad 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -333,7 +333,7 @@ dependencies = [
 
 [[package]]
 name = "database-tree"
-version = "0.1.2"
+version = "0.1.0"
 dependencies = [
  "anyhow",
  "chrono",
diff --git a/database-tree/Cargo.toml b/database-tree/Cargo.toml
index 0e0805f..284a002 100644
--- a/database-tree/Cargo.toml
+++ b/database-tree/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "database-tree"
-version = "0.1.2"
-authors = ["Stephan Dilly <dilly.stephan@gmail.com>"]
+version = "0.1.0"
+authors = ["Takayuki Maeda <takoyaki0316@gmail.com>"]
 edition = "2018"
 license = "MIT"
 homepage = "https://github.com/TaKO8Ki/gobang"
diff --git a/database-tree/src/databasetreeitems.rs b/database-tree/src/databasetreeitems.rs
index c455526..406163e 100644
--- a/database-tree/src/databasetreeitems.rs
+++ b/database-tree/src/databasetreeitems.rs
@@ -26,8 +26,8 @@ impl DatabaseTreeItems {
                 .iter()
                 .filter(|item| item.is_database() || item.is_match(&filter_text))
                 .map(|item| {
+                    let mut item = item.clone();
                     if item.is_database() {
-                        let mut item = item.clone();
                         item.set_collapsed(false);
                         item
                     } else {
@@ -240,9 +240,8 @@ impl DatabaseTreeItems {
 
             let item_kind = self.tree_items[i].kind().clone();
 
-            if matches!(item_kind, DatabaseTreeItemKind::Database{ collapsed, .. } if collapsed) {
-                inner_collapsed = Some(item_kind.clone());
-            } else if matches!(item_kind, DatabaseTreeItemKind::Schema{ collapsed, .. } if collapsed)
+            if matches!(item_kind, DatabaseTreeItemKind::Database{ collapsed, .. } if collapsed)
+                || matches!(item_kind, DatabaseTreeItemKind::Schema{ collapsed, .. } if collapsed)
             {
                 inner_collapsed = Some(item_kind.clone());
             }
diff --git a/src/database/postgres.rs b/src/database/postgres.rs
index 0e2e0a0..8485828 100644
--- a/src/database/postgres.rs
+++ b/src/database/postgres.rs
@@ -74,12 +74,12 @@ impl Pool for PostgresPool {
             t.schema
                 .as_ref()
                 .map(|schema| schema.to_string())
-                .unwrap_or("".to_string())
+                .unwrap_or_else(|| "".to_string())
         }) {
             schemas.push(
                 Schema {
                     name: key,
-                    tables: group.map(|g| g.clone()).collect(),
+                    tables: group.cloned().collect(),
                 }
                 .into(),
             )