diff --git a/lib/db_base.cpp b/lib/db_base.cpp
index ea45874f..63b5bf9f 100644
--- a/lib/db_base.cpp
+++ b/lib/db_base.cpp
@@ -228,7 +228,6 @@ void db_base::insertPKI(pki_base *pki)
 		else
 			db.commit();
 	}
-	emit columnsContentChanged();
 }
 
 QString db_base::pem2QString(QModelIndexList indexes) const
diff --git a/lib/pki_scard.cpp b/lib/pki_scard.cpp
index 249b7fcb..298dfd07 100644
--- a/lib/pki_scard.cpp
+++ b/lib/pki_scard.cpp
@@ -112,6 +112,8 @@ void pki_scard::restoreSql(QSqlRecord &rec)
 	slot_label = rec.value(VIEW_tokens_slot_label).toString();
 	object_id = rec.value(VIEW_tokens_object_id).toString();
 	card_manufacturer = rec.value(VIEW_tokens_card_manufacturer).toString();
+	isPub = false;
+	qDebug() << card_manufacturer <<card_serial<<card_model<<card_label<<slot_label<<object_id;
 }
 
 QSqlError pki_scard::deleteSqlData()
diff --git a/lib/x509rev.cpp b/lib/x509rev.cpp
index 5086b8c6..2e50103f 100644
--- a/lib/x509rev.cpp
+++ b/lib/x509rev.cpp
@@ -280,6 +280,9 @@ bool x509revList::sqlUpdateNoTrans(QVariant caId)
 
 bool x509revList::sqlUpdate(QVariant caId)
 {
+	return sqlUpdateNoTrans(caId);
+#warning Fix nested db.transaction()
+#if 0
 	QSqlDatabase db = QSqlDatabase::database();
 
 	if (!db.transaction())
@@ -290,4 +293,5 @@ bool x509revList::sqlUpdate(QVariant caId)
 	}
 	db.commit();
 	return true;
+#endif
 }
diff --git a/widgets/MW_database.cpp b/widgets/MW_database.cpp
index 822acbe5..d1cc2e93 100644
--- a/widgets/MW_database.cpp
+++ b/widgets/MW_database.cpp
@@ -25,7 +25,7 @@
 
 QSqlError MainWindow::initSqlDB()
 {
-	QStringList schemas[2]; schemas[0]
+	QStringList schemas[3]; schemas[0]
 
 /* The "32bit hash" in public_keys, x509super, requests, certs and crls
  * is used to quickly find items in the DB by reference.
@@ -265,6 +265,38 @@ QSqlError MainWindow::initSqlDB()
 
 
 << "UPDATE settings SET value='2' WHERE key_='schema'"
+
+	;
+/* Schema Version 3 */
+	schemas[2]
+
+<< "CREATE INDEX i_settings_key_ ON settings (key_)"
+<< "CREATE INDEX i_items_id ON items (id)"
+<< "CREATE INDEX i_public_keys_item ON public_keys (item)"
+<< "CREATE INDEX i_public_keys_hash ON public_keys (hash)"
+<< "CREATE INDEX i_private_keys_item ON private_keys (item)"
+<< "CREATE INDEX i_tokens_item ON tokens (item)"
+<< "CREATE INDEX i_token_mechanism_item ON token_mechanism (item)"
+<< "CREATE INDEX i_x509super_item ON x509super (item)"
+<< "CREATE INDEX i_x509super_subj_hash ON x509super (subj_hash)"
+<< "CREATE INDEX i_x509super_key_hash ON x509super (key_hash)"
+<< "CREATE INDEX i_x509super_pkey ON x509super (pkey)"
+<< "CREATE INDEX i_requests_item ON requests (item)"
+<< "CREATE INDEX i_requests_hash ON requests (hash)"
+<< "CREATE INDEX i_certs_item ON certs (item)"
+<< "CREATE INDEX i_certs_hash ON certs (hash)"
+<< "CREATE INDEX i_certs_iss_hash ON certs (iss_hash)"
+<< "CREATE INDEX i_certs_serial ON certs (serial)"
+<< "CREATE INDEX i_certs_issuer ON certs (issuer)"
+<< "CREATE INDEX i_certs_ca ON certs (ca)"
+<< "CREATE INDEX i_authority_item ON authority (item)"
+<< "CREATE INDEX i_crls_item ON crls (item)"
+<< "CREATE INDEX i_crls_hash ON crls (hash)"
+<< "CREATE INDEX i_crls_iss_hash ON crls (iss_hash)"
+<< "CREATE INDEX i_crls_issuer ON crls (issuer)"
+<< "CREATE INDEX i_revocations_caId_serial ON revocations (caId, serial)"
+<< "CREATE INDEX i_templates_item ON templates (item)"
+<< "UPDATE settings SET value='3' WHERE key_='schema'"
 	;
 
 	XSqlQuery q;