diff --git a/src/FindForm.cpp b/src/FindForm.cpp
index f02634f7..04bcc730 100644
--- a/src/FindForm.cpp
+++ b/src/FindForm.cpp
@@ -36,11 +36,13 @@ void findForm::showResults(resultMap rmap)
     findTableWidget->clearContents();
     findTableWidget->setSortingEnabled(false);
     resultMap::Iterator it;
+    int rowNum;
     findTableWidget->setRowCount(rmap.size());
-    for ( it = rmap.begin(); it != rmap.end(); ++it ) {
-        QString firstline = it.value().section( '\n', 0,0 );
-        findTableWidget->setItem( it.key(), 0, new QTableWidgetItem( QString::number(it.key() + 1) ) );
-        findTableWidget->setItem( it.key(), 1, new QTableWidgetItem( firstline) );
+    for(it=rmap.begin(),rowNum=0;it!=rmap.end();++it,rowNum++)
+    {
+        QString firstline = it.value().section('\n', 0, 0);
+        findTableWidget->setItem(rowNum, 0, new QTableWidgetItem(QString::number(it.key() + 1)));
+        findTableWidget->setItem(rowNum, 1, new QTableWidgetItem(firstline));
     }
     QString results = "Found: ";
     results.append(QString::number(findTableWidget->rowCount()));
@@ -58,6 +60,9 @@ void findForm::resetFields(QStringList fieldlist)
 {
     findFieldCombobox->clear();
     findFieldCombobox->addItems(fieldlist);
+    searchLine->setText("");
+    findOperatorComboBox->setCurrentIndex(0);
+    findTableWidget->setRowCount(0);
 }
 
 void findForm::resetResults()
@@ -70,8 +75,8 @@ void findForm::resetResults()
 void findForm::recordSelected( QTableWidgetItem * witem)
 {
     if (witem) {
-        int recNum = witem->text().toInt();
-        emit showrecord(recNum);
+        int recNum = findTableWidget->item(witem->row(), 0)->text().toInt();
+        emit showrecord(recNum - 1);
     }
 }
 
@@ -79,5 +84,3 @@ void findForm::closeEvent( QCloseEvent * )
 {
         emit goingAway();
 }
-
-
diff --git a/src/FindForm.h b/src/FindForm.h
index facc7883..f8f12e2c 100644
--- a/src/FindForm.h
+++ b/src/FindForm.h
@@ -68,6 +68,7 @@ public:
         findTableWidget->setHorizontalHeaderItem(1, new QTableWidgetItem( QObject::tr("Data") ));
         findTableWidget->setObjectName(QString::fromUtf8("findListView"));
         findTableWidget->setMidLineWidth(30);
+        findTableWidget->setEditTriggers(QAbstractItemView::NoEditTriggers);
         //findTableWidget->setResizePolicy(Q3ScrollView::Manual);
         //findTableWidget->setResizeMode(Q3ListView::LastColumn);
 
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index abc66170..e1d06758 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -524,8 +524,8 @@ void MainWindow::lookfor( const QString & wfield, const QString & woperator, con
     statement.append(" ");
     //searchterm needs to be quoted if it is not a number
     bool ok = false;
-    wsearchterm.toDouble(&ok);
-    if (!ok) wsearchterm.toInt(&ok, 10);
+    finalsearchterm.toDouble(&ok);
+    if (!ok) finalsearchterm.toInt(&ok, 10);
     if (!ok) {//not a number, quote it
         char * formSQL = sqlite3_mprintf("%Q",(const char *) finalsearchterm.toUtf8());
         statement.append(formSQL);