Index: openacs-4/packages/xowf/tcl/atjob-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/atjob-procs.tcl,v
diff -u -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/xowf/tcl/atjob-procs.tcl	11 Nov 2015 12:31:32 -0000	1.3.2.1
+++ openacs-4/packages/xowf/tcl/atjob-procs.tcl	11 Nov 2015 19:06:03 -0000	1.3.2.2
@@ -153,19 +153,12 @@
     # To make sure we are not fetching pages from unmounted instances
     # we check for package_id not null.
     #
-    set sql "select i.item_id
-              from cr_items i, cr_items i2, cr_revisions r, xowiki_page_instance t, acs_objects o
-              where i.item_id = r.item_id and i.live_revision = r.revision_id 
-                      and r.revision_id = t.page_instance_id and o.object_id = i.item_id
-                      and i2.item_id = t.page_template and i2.content_type = '::xowiki::Form'
-                      and i2.name = 'en:atjob-form'
-                      and r.publish_date $op to_timestamp(:ansi_time,'YYYY-MM-DD HH24:MI')
-                      and i.publish_status = 'production'
-                      and o.package_id is not null"
     set sql "select xi.item_id
-              from xowiki_form_instance_item_view xi, cr_items i2,
+              from xowiki_form_instance_item_index xi, cr_items i2, cr_items i1, cr_revisions cr
               where i2.item_id = xi.page_template and i2.content_type = '::xowiki::Form' and i2.name = 'en:atjob-form'
-                and xi.publish_date $op to_timestamp(:ansi_time,'YYYY-MM-DD HH24:MI')
+                and cr.publish_date $op to_timestamp(:ansi_time,'YYYY-MM-DD HH24:MI')
+                and i1.item_id = xi.item_id
+                and cr.revision_id = i1.live_revision
                 and xi.publish_status = 'production'
                 and xi.package_id is not null"