--- a/servlib/bundling/BundleDaemon.cc	Thu Sep 01 15:53:24 2011 +0100
+++ b/servlib/bundling/BundleDaemon.cc	Wed Oct 05 13:52:40 2011 +0100
@@ -923,7 +923,6 @@
 
     }
 
-    // If the even source is PEER or STORE,
     // try to handle a BPQ block
     if ( event->source_ == EVENTSRC_APP   || 
          event->source_ == EVENTSRC_PEER  || 
@@ -931,9 +930,9 @@
          event->source_ == EVENTSRC_FRAGMENTATION) {
 
         // TODO: change this to allow fragment responses be sent
-        if ( ! bundle->is_fragment() ) {
-            handle_bpq_block(bundle, event);
-        }
+//        if ( ! bundle->is_fragment() ) {
+		handle_bpq_block(bundle, event);
+//        }
     }
 
     // If the bundle contains a BPQ query that was successfully answered
@@ -2684,9 +2683,10 @@
 
     if (bpq_block.kind() == BPQBlock::KIND_QUERY) {
     	if (bpq_cache()->answer_query(bundle, &bpq_block)) {
+    		log_info_p("/dtn/daemon/bpq", "Query: %s answered completely",
+    				(char*)bpq_block.query_val());
             event->daemon_only_ = true;
         }
-    	// TODO: make sure updated block is put back into bundle
     }
     else if (bpq_block.kind() == BPQBlock::KIND_RESPONSE) {
     	// don't accept local responses