diff --git a/wrenchboard/src/shared_tool/jobs_manager.cc b/wrenchboard/src/shared_tool/jobs_manager.cc
index bc62a3cc..4c1292e8 100644
--- a/wrenchboard/src/shared_tool/jobs_manager.cc
+++ b/wrenchboard/src/shared_tool/jobs_manager.cc
@@ -16,7 +16,15 @@
 #include "mobile.h"
 #include "jobs_manager.h"
 
-
+/*
+  $mysql2 = "SELECT jo.added::date AS start_job_date, jo.expire::date AS end_job_date, j.title, (CASE WHEN jo.public_view > 0 THEN '-Public View' ELSE jo.email END)  AS job_to,jo.offer_code AS offer_code,"
+            . "'<input type=submit onclick=\"return post_nav_find_action($jbx,'''||jo.offer_code||''')\"  name=\"manage\" class=\"btn btn-primary btn-xs\" value=\"View\">' AS View  "
+            . "FROM members_jobs_offer jo LEFT JOIN members_jobs j ON j.id = jo.job_id "
+            . "WHERE jo.expire > now() AND jo.status = 1 "
+            . "AND jo.member_id = " . $_SESSION['member_id'] . " ORDER BY jo.id DESC LIMIT 400";
+        $query2 = $this->db->query($mysql2);
+        $data['offer_dash_rows'] = $query2->result();
+*/
 long WrenchJobManagerOffers( CVars in, CVars &out){
   logfmt(logINFO, "ENTER CALL long WrenchJobManagerOffers");
     char vname[30];
@@ -30,11 +38,12 @@ long WrenchJobManagerOffers( CVars in, CVars &out){
          long limit = REQ_LONG(in, "limit", 1, -1);
 
         out["total_record"] = "0";
-        res = pgsql_query("SELECT id FROM members_jobs WHERE member_id = %lu AND status=1 ORDER BY id DESC", in["member_id"].Long());
+        res = pgsql_query("SELECT id FROM members_jobs_offer WHERE member_id = %lu AND status=1 AND expire > now() ", in["member_id"].Long());
         out["total_record"] = pgsql_num_rows(res);
 
-          res = pgsql_query("SELECT id AS job_id, * FROM members_jobs WHERE member_id = %lu  AND status=1 "
-                            "ORDER BY id DESC LIMIT %lu OFFSET %lu", in["member_id"].Long(), limit, offset);
+        res = pgsql_query("SELECT id AS job_id,jo.expire, j.* FROM members_jobs_offer jo LEFT JOIN members_jobs j ON ON j.id = jo.job_id "
+                        " WHERE jo.expire > now() AND jo.status = 1 AND jo.member_id = %lu  AND jo.status=1 "
+                        " ORDER BY jo.id DESC LIMIT %lu OFFSET %lu", in["member_id"].Long(), limit, offset);
 
           if (res != NULL && pgsql_num_rows(res) > 0) {
               out["total_record"] = pgsql_num_rows(res);
@@ -68,6 +77,9 @@ long WrenchJobManagerOffers( CVars in, CVars &out){
 
                   snprintf(vname, sizeof (vname), "job_uid_%05d", i);
                   out[vname] = rec["uid"];
+
+                 snprintf(vname, sizeof (vname), "expire_%05d", i);
+                 out[vname] = rec["expire"];
               }
           }
           ret = PHP_API_OK;