  		/* do a summary query */
  		GPtrArray *ids = e_book_backend_summary_search (bf->priv->summary, e_data_book_view_get_card_query (book_view));
  		int i;
-@@ -668,8 +704,7 @@
+ 
++		g_debug (G_STRLOC ": Using summmary for %s", query);
++
+ 		for (i = 0; i < ids->len; i ++) {
+ 			char *id = g_ptr_array_index (ids, i);
+ 
+@@ -668,8 +707,7 @@
  		}
  
  		g_ptr_array_free (ids, TRUE);

+  for (i = 0; i < G_N_ELEMENTS (sexp_symbols); i++)
+  {
+    e_sexp_add_function (sexp, 0, sexp_symbols[i].name, 
+        sexp_symbols[i].test_function, index);
+  }
+
+  /* Pull in the query as the text for the s-exp */

+  ESExpResult *sexp_result = NULL;
+  gint i = 0;
+  gint sexp_error = 0;
+  gboolean res = TRUE; /* whether we can actually use the index */
+
+  sexp = e_sexp_new ();
+
