--- SugarCRM.php.bak    2013-08-07 14:58:10.910477331 +0000
+++ SugarCRM.php    2013-08-07 16:08:59.412595782 +0000
@@ -156,26 +156,29 @@
                 else
                 {
                         $calls_ctag_query = "
-                                (SELECT
-                                UNIX_TIMESTAMP(date_modified)
+                                SELECT
+                                UNIX_TIMESTAMP(calls.date_modified)
                                 AS ctag_number
                                 FROM calls
-                                WHERE (assigned_user_id = '{$this->user->id}')
-                                OR (id IN (SELECT call_id FROM calls_users WHERE user_id = '{$this->user->id}')))
+               JOIN calls_users on calls_users.call_id = calls.id
+                                WHERE assigned_user_id = '{$this->user->id}'
                                 ORDER BY ctag_number DESC LIMIT 1
                                 ";

                         $default_ctag_query = "
-                                (SELECT
-                                UNIX_TIMESTAMP(date_modified)
-                                AS ctag_number
-                                FROM meetings
-                                WHERE id IN (SELECT meeting_id FROM meetings_users WHERE user_id = '{$this->user->id}') ORDER BY date_modified DESC LIMIT 1)
-                                UNION
-                                (SELECT UNIX_TIMESTAMP(date_modified) AS ctag_number FROM meetings_contacts
-                                        WHERE meeting_id IN (SELECT meeting_id FROM meetings_users
-                                                WHERE user_id = '{$this->user->id}') ORDER BY date_modified DESC LIMIT 1)
-                                UNION
+               (SELECT
+                   UNIX_TIMESTAMP(meetings.date_modified)
+                   AS ctag_number
+                   FROM meetings
+                   JOIN meetings_users on meetings.id = meetings_users.meeting_id
+                   WHERE user_id = '{$this->user->id}' ORDER BY meetings.date_modified DESC LIMIT 1)
+               UNION
+               (SELECT UNIX_TIMESTAMP(meetings_contacts.date_modified) AS ctag_number
+                   FROM meetings_contacts
+                   JOIN meetings_users on meetings_users.meeting_id = meetings_contacts.meeting_id
+                   WHERE meetings_users.user_id = '{$this->user->id}'
+                   ORDER BY meetings_contacts.date_modified DESC LIMIT 1)
+               UNION
                                 (SELECT UNIX_TIMESTAMP(date_modified) AS ctag_number FROM tasks WHERE (assigned_user_id = '{$this->user->id}') ORDER BY date_modified DESC LIMIT 1)
                                 ORDER BY ctag_number DESC LIMIT 1
                                 ";
@@ -239,18 +242,16 @@
            if($calendar_name == 'default'){
                $vevent_queries['Meeting'] = "SELECT id,date_modified,date_start FROM meetings WHERE
                    id IN (SELECT meeting_id FROM meetings_users WHERE user_id = '{$this->user->id}' AND deleted = '0')
-                   AND date_start IS NOT NULL AND date_start != '' AND date_start NOT LIKE '0000-00-00%'
-                   AND date_start NOT LIKE '1970-01-01%' AND deleted = '0';";
+                   AND date_start IS NOT NULL AND deleted = '0' and date_start > DATE_SUB(now(), INTERVAL 6 MONTH);";
                $vtodo_queries['Task'] = "SELECT id,date_modified,date_start,date_due FROM tasks WHERE
                    (assigned_user_id = '{$this->user->id}' AND deleted = '0')
                    AND status != 'Completed';";
            } else if($calendar_name == 'calls'){
                $vevent_queries['Call'] = "SELECT id,date_modified,date_start FROM calls WHERE
-                   ((assigned_user_id = '{$this->user->id}' AND deleted = '0')
-                   OR (id IN (SELECT call_id FROM calls_users WHERE user_id = '{$this->user->id}' AND deleted = '0'))
-                   AND date_start IS NOT NULL AND date_start != '' AND date_start NOT LIKE '0000-00-00%'
-                   AND date_start NOT LIKE '1970-01-01%'AND deleted = '0');";
-           }
+                                        ((assigned_user_id = '{$this->user->id}' AND deleted = '0')
+                                        OR (id IN (SELECT call_id FROM calls_users WHERE user_id = '{$this->user->id}' AND deleted = '0'))
+                                        AND date_start > DATE_SUB(now(), INTERVAL 6 MONTH) AND deleted = '0');";
+                        }
        }

        //