diff --git a/sflphone-gtk/src/calllist.h b/sflphone-gtk/src/calllist.h
index bfd773263bc7bf227f8341f15878723092b3ffd6..a361c9bb94da12eb4791a42493e1f4e8911c6a3e 100644
--- a/sflphone-gtk/src/calllist.h
+++ b/sflphone-gtk/src/calllist.h
@@ -119,6 +119,8 @@ typedef struct {
 	GtkWidget* view;
 	GtkWidget* tree;
 
+        GtkWidget* searchbar;
+
 	// Calllist vars
 	GQueue* callQueue;
 	call_t* selectedCall;
diff --git a/sflphone-gtk/src/calltab.c b/sflphone-gtk/src/calltab.c
index 1ec9a9a95d357d03fa90fc93a8729924d0a6b020..d0ac6954d6f4a5936c290e68b52239c59e1fc166 100644
--- a/sflphone-gtk/src/calltab.c
+++ b/sflphone-gtk/src/calltab.c
@@ -33,6 +33,7 @@ calltab_init()
 	ret->store = NULL;
 	ret->view = NULL;
 	ret->tree = NULL;
+        ret->searchbar = NULL;
 	ret->callQueue = NULL;
 	ret->selectedCall = NULL;
 
diff --git a/sflphone-gtk/src/calltree.c b/sflphone-gtk/src/calltree.c
index b9fbdab365ebf7065185f8e2469a834cb0fc19e8..24d2001f290365dbfbfd6afb202478e8d49a08c5 100644
--- a/sflphone-gtk/src/calltree.c
+++ b/sflphone-gtk/src/calltree.c
@@ -407,19 +407,20 @@ void  row_activated(GtkTreeView       *tree_view UNUSED,
 
   if (selectedCall)
   {
+    g_print("is selected call? Current state: %i \n",selectedCall->state);
     // Get the right event from the right calltree
     if( active_calltree == current_calls )
     {
       switch(selectedCall->state)
       {
-	case CALL_STATE_INCOMING:
+        case CALL_STATE_INCOMING:
 	  dbus_accept(selectedCall);
           stop_notification();
 	  break;
 	case CALL_STATE_HOLD:
 	  dbus_unhold(selectedCall);
 	  break;
-	case CALL_STATE_RINGING:
+        case CALL_STATE_RINGING:
 	case CALL_STATE_CURRENT:
 	case CALL_STATE_BUSY:
 	case CALL_STATE_FAILURE:
diff --git a/sflphone-gtk/src/mainwindow.c b/sflphone-gtk/src/mainwindow.c
index 5eb09084712bba75755e6280d47930bcf7e927ad..25097dce2b1cbcd8e862e4b23aee3197d6c83039 100644
--- a/sflphone-gtk/src/mainwindow.c
+++ b/sflphone-gtk/src/mainwindow.c
@@ -137,11 +137,13 @@ create_main_window ()
 
   gtk_box_pack_start (GTK_BOX (vbox), subvbox, FALSE /*expand*/, FALSE /*fill*/, 0 /*padding*/);
 
-  if( SHOW_SEARCHBAR ){
-    filterEntry = create_filter_entry();
-    gtk_box_pack_start (GTK_BOX (subvbox), filterEntry, FALSE /*expand*/, TRUE /*fill*/,  0 /*padding*/);
-    gtk_widget_show_all ( filterEntry );
-  }
+  
+  // if( SHOW_SEARCHBAR ){
+  //   filterEntry = create_filter_entry();
+  //   gtk_box_pack_start (GTK_BOX (subvbox), filterEntry, FALSE /*expand*/, TRUE /*fill*/,  0 /*padding*/);
+  //   gtk_widget_show_all ( filterEntry );
+  // }
+  
 
  if( SHOW_VOLUME ){
     speaker_control = create_slider("speaker");
@@ -277,15 +279,15 @@ void
 main_window_searchbar( gboolean *state ){
   if( !SHOW_SEARCHBAR )
   {
-    filterEntry = create_filter_entry();
-    gtk_box_pack_start (GTK_BOX (subvbox), filterEntry, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
-    gtk_widget_show_all (filterEntry);
-    *state = TRUE;
+    // filterEntry = create_filter_entry();
+    // gtk_box_pack_start (GTK_BOX (subvbox), filterEntry, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
+    // gtk_widget_show_all (filterEntry);
+    // *state = TRUE;
   }
   else
   {
-    gtk_container_remove( GTK_CONTAINER(subvbox) , filterEntry );
-    *state = FALSE;
+    // gtk_container_remove( GTK_CONTAINER(subvbox) , filterEntry );
+    // *state = FALSE;
   }
 }