Index: openacs-4/packages/faq/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/index.adp,v
diff -u -r1.13 -r1.13.2.1
--- openacs-4/packages/faq/www/index.adp	3 Jul 2015 10:47:34 -0000	1.13
+++ openacs-4/packages/faq/www/index.adp	20 Sep 2015 17:45:49 -0000	1.13.2.1
@@ -4,20 +4,17 @@
 
 <h1>#faq.FAQs#</h1>
 
-<p>
-      @notification_chunk;noquote@ 
-</p>
+<p><include src="/packages/notifications/lib/notification-widget" type="all_faq_qa_notif"
+	 object_id="@package_id;literal@"
+	 pretty_name="FAQs">
+
 <if @admin_p@ eq 1>
-  <p>
-    <a href="./admin" class="button" title="#faq.administer#">#faq.administer#</a>
-  </p>
+  <p><a href="./admin" class="button" title="#faq.administer#">#faq.administer#</a></p>
 </if>
 
-
 <if @faqs:rowcount@ eq 0>
  <p><i>#faq.lt_no_FAQs#</i></p>
 </if>
-
 <else>
  <ul>
   <multiple name=faqs>
Index: openacs-4/packages/faq/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/index.tcl,v
diff -u -r1.9.4.1 -r1.9.4.2
--- openacs-4/packages/faq/www/index.tcl	12 Sep 2015 11:06:13 -0000	1.9.4.1
+++ openacs-4/packages/faq/www/index.tcl	20 Sep 2015 17:45:49 -0000	1.9.4.2
@@ -17,24 +17,12 @@
 }
 
 set package_id [ad_conn package_id]
-
 set context {}
 
-
 set user_id [ad_conn user_id]
- 
 permission::require_permission -object_id $package_id -privilege faq_view_faq
-
 set admin_p 0
 
-
-set notification_chunk [notification::display::request_widget \
-                        -type all_faq_qa_notif \
-			-object_id [ad_conn package_id] \
-                        -pretty_name FAQs \
-                        -url [ad_conn url] \
-                        ]
-
 if {[permission::permission_p -party_id $user_id -object_id $package_id -privilege faq_admin_faq]} {
     set admin_p 1
 }
Index: openacs-4/packages/faq/www/one-faq.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-faq.adp,v
diff -u -r1.20 -r1.20.2.1
--- openacs-4/packages/faq/www/one-faq.adp	3 Jul 2015 10:47:34 -0000	1.20
+++ openacs-4/packages/faq/www/one-faq.adp	20 Sep 2015 17:45:49 -0000	1.20.2.1
@@ -1,15 +1,15 @@
 <master>
 <property name="context">@context;literal@</property>
-<property name="doc(title)">#faq.FAQs#</property>
-
-<h1>@faq_info.faq_name;noquote@</h1>
-
-<p>
-      @notification_chunk;noquote@ 
-</p>
 <property name="doc(title)">@faq_info.faq_name;literal@</property>
 <property name="displayed_object_id">@faq_id;literal@</property>
 
+<h1>@faq_info.faq_name@</h1>
+
+<p><include src="/packages/notifications/lib/notification-widget" type="one_faq_qa_notif"
+	 object_id="@faq_id;literal@"
+	 pretty_name="@faq_info.faq_name;literal@"
+	 url="@return_url;literal@" >
+	 
 <table width="70%" border="0">
 <tr><td align="left" valign="top">
 <if @one_question:rowcount@ eq 0>
Index: openacs-4/packages/faq/www/one-faq.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/one-faq.tcl,v
diff -u -r1.11.2.1 -r1.11.2.2
--- openacs-4/packages/faq/www/one-faq.tcl	12 Sep 2015 11:06:13 -0000	1.11.2.1
+++ openacs-4/packages/faq/www/one-faq.tcl	20 Sep 2015 17:45:49 -0000	1.11.2.2
@@ -14,7 +14,6 @@
 #/faq/www/one-faq.tcl
 
 set package_id [ad_conn package_id]
-
 set user_id [ad_conn user_id]
 
 permission::require_permission -object_id $package_id -privilege faq_view_faq
@@ -59,15 +58,8 @@
     }
 }
 
-set notification_chunk [notification::display::request_widget \
-                        -type one_faq_qa_notif \
-                        -object_id $faq_id \
-                        -pretty_name $faq_info(faq_name) \
-                        -url [ad_conn url]?faq_id=$faq_id \
-                        ]
+set return_url [export_vars -base [ad_conn url] {faq_id}]
 
-set return_url "[ad_conn url]?faq_id=$faq_id"
-
 if { [apm_package_installed_p "general-comments"] 
      && [parameter::get -package_id $package_id -parameter GeneralCommentsP -default 0] } {
     set gc_link [general_comments_create_link -link_attributes { title="#general-comments.Add_comment#" } $faq_id $return_url]