diff --git a/modules/julio_clubs/modules/julio_clubs_announcements/julio_clubs_announcements.views_default.inc b/modules/julio_clubs/modules/julio_clubs_announcements/julio_clubs_announcements.views_default.inc
index bafdfc6..e7330bf 100644
--- a/modules/julio_clubs/modules/julio_clubs_announcements/julio_clubs_announcements.views_default.inc
+++ b/modules/julio_clubs/modules/julio_clubs_announcements/julio_clubs_announcements.views_default.inc
@@ -79,6 +79,10 @@ function julio_clubs_announcements_views_default_views() {
   $handler->display->display_options['sorts']['created']['table'] = 'node';
   $handler->display->display_options['sorts']['created']['field'] = 'created';
   $handler->display->display_options['sorts']['created']['order'] = 'DESC';
+  $handler->display->display_options['filter_groups']['groups'] = array(
+    1 => 'AND',
+    2 => 'OR',
+  );
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
@@ -93,6 +97,14 @@ function julio_clubs_announcements_views_default_views() {
   $handler->display->display_options['filters']['type']['value'] = array(
     'julio_announcement' => 'julio_announcement',
   );
+  $handler->display->display_options['filters']['type']['group'] = 1;
+  /* Filter criterion: OG membership: Group ID */
+  $handler->display->display_options['filters']['gid']['id'] = 'gid';
+  $handler->display->display_options['filters']['gid']['table'] = 'og_membership';
+  $handler->display->display_options['filters']['gid']['field'] = 'gid';
+  $handler->display->display_options['filters']['gid']['relationship'] = 'og_membership_rel';
+  $handler->display->display_options['filters']['gid']['value']['value'] = variable_get('julio_clubs_nid', 0);
+  $handler->display->display_options['filters']['gid']['group'] = 2;
   /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type_1']['id'] = 'type_1';
   $handler->display->display_options['filters']['type_1']['table'] = 'node';
@@ -101,6 +113,7 @@ function julio_clubs_announcements_views_default_views() {
   $handler->display->display_options['filters']['type_1']['value'] = array(
     'julio_club' => 'julio_club',
   );
+  $handler->display->display_options['filters']['type_1']['group'] = 2;
 
   /* Display: Page */
   $handler = $view->new_display('page', 'Page', 'page');
@@ -170,29 +183,6 @@ function julio_clubs_announcements_views_default_views() {
     'multiple_to' => '',
   );
   $handler->display->display_options['fields']['field_julio_event_date']['field_api_classes'] = 0;
-  $handler->display->display_options['defaults']['filters'] = FALSE;
-  /* Filter criterion: Content: Published */
-  $handler->display->display_options['filters']['status']['id'] = 'status';
-  $handler->display->display_options['filters']['status']['table'] = 'node';
-  $handler->display->display_options['filters']['status']['field'] = 'status';
-  $handler->display->display_options['filters']['status']['value'] = 1;
-  $handler->display->display_options['filters']['status']['group'] = 1;
-  $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  /* Filter criterion: Content: Type */
-  $handler->display->display_options['filters']['type']['id'] = 'type';
-  $handler->display->display_options['filters']['type']['table'] = 'node';
-  $handler->display->display_options['filters']['type']['field'] = 'type';
-  $handler->display->display_options['filters']['type']['value'] = array(
-    'julio_announcement' => 'julio_announcement',
-  );
-  /* Filter criterion: Content: Type */
-  $handler->display->display_options['filters']['type_1']['id'] = 'type_1';
-  $handler->display->display_options['filters']['type_1']['table'] = 'node';
-  $handler->display->display_options['filters']['type_1']['field'] = 'type';
-  $handler->display->display_options['filters']['type_1']['relationship'] = 'og_membership_related_node_group';
-  $handler->display->display_options['filters']['type_1']['value'] = array(
-    'julio_club' => 'julio_club',
-  );
   $handler->display->display_options['path'] = 'clubs/announcements';
 
   /* Display: Clubs News */
diff --git a/modules/julio_clubs/modules/julio_clubs_announcements_ui/julio_clubs_announcements_ui.context.inc b/modules/julio_clubs/modules/julio_clubs_announcements_ui/julio_clubs_announcements_ui.context.inc
index fd6482a..962ef93 100644
--- a/modules/julio_clubs/modules/julio_clubs_announcements_ui/julio_clubs_announcements_ui.context.inc
+++ b/modules/julio_clubs/modules/julio_clubs_announcements_ui/julio_clubs_announcements_ui.context.inc
@@ -19,7 +19,7 @@ function julio_clubs_announcements_ui_context_default_contexts() {
   $context->conditions = array(
     'menu' => array(
       'values' => array(
-        'node/5' => 'node/5',
+        'node/' . variable_get('julio_clubs_nid', 0) => 'node/' . variable_get('julio_clubs_nid', 0),
       ),
     ),
   );
diff --git a/modules/julio_clubs/modules/julio_clubs_events/julio_clubs_events.views_default.inc b/modules/julio_clubs/modules/julio_clubs_events/julio_clubs_events.views_default.inc
index 29fa8ba..858a599 100644
--- a/modules/julio_clubs/modules/julio_clubs_events/julio_clubs_events.views_default.inc
+++ b/modules/julio_clubs/modules/julio_clubs_events/julio_clubs_events.views_default.inc
@@ -157,6 +157,10 @@ function julio_clubs_events_views_default_views() {
   $handler->display->display_options['sorts']['field_julio_event_date_value']['id'] = 'field_julio_event_date_value';
   $handler->display->display_options['sorts']['field_julio_event_date_value']['table'] = 'field_data_field_julio_event_date';
   $handler->display->display_options['sorts']['field_julio_event_date_value']['field'] = 'field_julio_event_date_value';
+  $handler->display->display_options['filter_groups']['groups'] = array(
+    1 => 'AND',
+    2 => 'OR',
+  );
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
@@ -171,11 +175,13 @@ function julio_clubs_events_views_default_views() {
   $handler->display->display_options['filters']['type']['value'] = array(
     'julio_event' => 'julio_event',
   );
+  $handler->display->display_options['filters']['type']['group'] = 1;
   /* Filter criterion: Content: Event date -  start date (field_julio_event_date) */
   $handler->display->display_options['filters']['field_julio_event_date_value']['id'] = 'field_julio_event_date_value';
   $handler->display->display_options['filters']['field_julio_event_date_value']['table'] = 'field_data_field_julio_event_date';
   $handler->display->display_options['filters']['field_julio_event_date_value']['field'] = 'field_julio_event_date_value';
   $handler->display->display_options['filters']['field_julio_event_date_value']['operator'] = '>=';
+  $handler->display->display_options['filters']['field_julio_event_date_value']['group'] = 1;
   $handler->display->display_options['filters']['field_julio_event_date_value']['default_date'] = 'now';
   /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type_1']['id'] = 'type_1';
@@ -185,6 +191,14 @@ function julio_clubs_events_views_default_views() {
   $handler->display->display_options['filters']['type_1']['value'] = array(
     'julio_club' => 'julio_club',
   );
+  $handler->display->display_options['filters']['type_1']['group'] = 2;
+  /* Filter criterion: OG membership: Group ID */
+  $handler->display->display_options['filters']['gid']['id'] = 'gid';
+  $handler->display->display_options['filters']['gid']['table'] = 'og_membership';
+  $handler->display->display_options['filters']['gid']['field'] = 'gid';
+  $handler->display->display_options['filters']['gid']['relationship'] = 'og_membership_rel';
+  $handler->display->display_options['filters']['gid']['value']['value'] = variable_get('julio_clubs_nid', 0);
+  $handler->display->display_options['filters']['gid']['group'] = 2;
 
   /* Display: Page */
   $handler = $view->new_display('page', 'Page', 'page');
@@ -271,6 +285,7 @@ function julio_clubs_events_views_default_views() {
   $handler->display->display_options['filters']['type']['value'] = array(
     'julio_event' => 'julio_event',
   );
+  $handler->display->display_options['filters']['type']['group'] = 1;
   /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type_1']['id'] = 'type_1';
   $handler->display->display_options['filters']['type_1']['table'] = 'node';
@@ -279,6 +294,14 @@ function julio_clubs_events_views_default_views() {
   $handler->display->display_options['filters']['type_1']['value'] = array(
     'julio_club' => 'julio_club',
   );
+  $handler->display->display_options['filters']['type_1']['group'] = 2;
+  /* Filter criterion: OG membership: Group ID */
+  $handler->display->display_options['filters']['gid']['id'] = 'gid';
+  $handler->display->display_options['filters']['gid']['table'] = 'og_membership';
+  $handler->display->display_options['filters']['gid']['field'] = 'gid';
+  $handler->display->display_options['filters']['gid']['relationship'] = 'og_membership_rel';
+  $handler->display->display_options['filters']['gid']['value']['value'] = variable_get('julio_clubs_nid', 0);
+  $handler->display->display_options['filters']['gid']['group'] = 2;
   $handler->display->display_options['path'] = 'clubs/calendar';
 
   /* Display: Upcoming - All */
diff --git a/modules/julio_clubs/modules/julio_clubs_events_ui/julio_clubs_events_ui.context.inc b/modules/julio_clubs/modules/julio_clubs_events_ui/julio_clubs_events_ui.context.inc
index af53a6a..64876dc 100644
--- a/modules/julio_clubs/modules/julio_clubs_events_ui/julio_clubs_events_ui.context.inc
+++ b/modules/julio_clubs/modules/julio_clubs_events_ui/julio_clubs_events_ui.context.inc
@@ -19,7 +19,7 @@ function julio_clubs_events_ui_context_default_contexts() {
   $context->conditions = array(
     'menu' => array(
       'values' => array(
-        'node/5' => 'node/5',
+        'node/' . variable_get('julio_clubs_nid', 0) => 'node/' . variable_get('julio_clubs_nid', 0),
       ),
     ),
   );
diff --git a/modules/julio_departments/modules/julio_departments_announcements/julio_departments_announcements.views_default.inc b/modules/julio_departments/modules/julio_departments_announcements/julio_departments_announcements.views_default.inc
index de5f8d5..21ec77c 100644
--- a/modules/julio_departments/modules/julio_departments_announcements/julio_departments_announcements.views_default.inc
+++ b/modules/julio_departments/modules/julio_departments_announcements/julio_departments_announcements.views_default.inc
@@ -79,6 +79,10 @@ function julio_departments_announcements_views_default_views() {
   $handler->display->display_options['sorts']['created']['table'] = 'node';
   $handler->display->display_options['sorts']['created']['field'] = 'created';
   $handler->display->display_options['sorts']['created']['order'] = 'DESC';
+  $handler->display->display_options['filter_groups']['groups'] = array(
+    1 => 'AND',
+    2 => 'OR',
+  );
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
@@ -93,6 +97,7 @@ function julio_departments_announcements_views_default_views() {
   $handler->display->display_options['filters']['type']['value'] = array(
     'julio_announcement' => 'julio_announcement',
   );
+  $handler->display->display_options['filters']['type']['group'] = 1;
   /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type_1']['id'] = 'type_1';
   $handler->display->display_options['filters']['type_1']['table'] = 'node';
@@ -101,6 +106,14 @@ function julio_departments_announcements_views_default_views() {
   $handler->display->display_options['filters']['type_1']['value'] = array(
     'julio_department' => 'julio_department',
   );
+  $handler->display->display_options['filters']['type_1']['group'] = 2;
+  /* Filter criterion: OG membership: Group ID */
+  $handler->display->display_options['filters']['gid']['id'] = 'gid';
+  $handler->display->display_options['filters']['gid']['table'] = 'og_membership';
+  $handler->display->display_options['filters']['gid']['field'] = 'gid';
+  $handler->display->display_options['filters']['gid']['relationship'] = 'og_membership_rel';
+  $handler->display->display_options['filters']['gid']['value']['value'] = variable_get('julio_departments_nid', 0);
+  $handler->display->display_options['filters']['gid']['group'] = 2;
 
   /* Display: Page */
   $handler = $view->new_display('page', 'Page', 'page');
@@ -170,29 +183,6 @@ function julio_departments_announcements_views_default_views() {
     'multiple_to' => '',
   );
   $handler->display->display_options['fields']['field_julio_event_date']['field_api_classes'] = 0;
-  $handler->display->display_options['defaults']['filters'] = FALSE;
-  /* Filter criterion: Content: Published */
-  $handler->display->display_options['filters']['status']['id'] = 'status';
-  $handler->display->display_options['filters']['status']['table'] = 'node';
-  $handler->display->display_options['filters']['status']['field'] = 'status';
-  $handler->display->display_options['filters']['status']['value'] = 1;
-  $handler->display->display_options['filters']['status']['group'] = 1;
-  $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  /* Filter criterion: Content: Type */
-  $handler->display->display_options['filters']['type']['id'] = 'type';
-  $handler->display->display_options['filters']['type']['table'] = 'node';
-  $handler->display->display_options['filters']['type']['field'] = 'type';
-  $handler->display->display_options['filters']['type']['value'] = array(
-    'julio_announcement' => 'julio_announcement',
-  );
-  /* Filter criterion: Content: Type */
-  $handler->display->display_options['filters']['type_1']['id'] = 'type_1';
-  $handler->display->display_options['filters']['type_1']['table'] = 'node';
-  $handler->display->display_options['filters']['type_1']['field'] = 'type';
-  $handler->display->display_options['filters']['type_1']['relationship'] = 'og_membership_related_node_group';
-  $handler->display->display_options['filters']['type_1']['value'] = array(
-    'julio_department' => 'julio_department',
-  );
   $handler->display->display_options['path'] = 'departments/announcements';
 
   /* Display: Departments News */
diff --git a/modules/julio_departments/modules/julio_departments_announcements_ui/julio_departments_announcements_ui.context.inc b/modules/julio_departments/modules/julio_departments_announcements_ui/julio_departments_announcements_ui.context.inc
index d672e66..45d0080 100644
--- a/modules/julio_departments/modules/julio_departments_announcements_ui/julio_departments_announcements_ui.context.inc
+++ b/modules/julio_departments/modules/julio_departments_announcements_ui/julio_departments_announcements_ui.context.inc
@@ -19,7 +19,7 @@ function julio_departments_announcements_ui_context_default_contexts() {
   $context->conditions = array(
     'menu' => array(
       'values' => array(
-        'node/6' => 'node/6',
+        'node/' . variable_get('julio_departments_nid', 0) => 'node/' . variable_get('julio_departments_nid', 0),
       ),
     ),
   );
diff --git a/modules/julio_departments/modules/julio_departments_events/julio_departments_events.views_default.inc b/modules/julio_departments/modules/julio_departments_events/julio_departments_events.views_default.inc
index 0d6c0ee..a6b2e7b 100644
--- a/modules/julio_departments/modules/julio_departments_events/julio_departments_events.views_default.inc
+++ b/modules/julio_departments/modules/julio_departments_events/julio_departments_events.views_default.inc
@@ -157,6 +157,10 @@ function julio_departments_events_views_default_views() {
   $handler->display->display_options['sorts']['field_julio_event_date_value']['id'] = 'field_julio_event_date_value';
   $handler->display->display_options['sorts']['field_julio_event_date_value']['table'] = 'field_data_field_julio_event_date';
   $handler->display->display_options['sorts']['field_julio_event_date_value']['field'] = 'field_julio_event_date_value';
+  $handler->display->display_options['filter_groups']['groups'] = array(
+    1 => 'AND',
+    2 => 'OR',
+  );
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
@@ -171,11 +175,13 @@ function julio_departments_events_views_default_views() {
   $handler->display->display_options['filters']['type']['value'] = array(
     'julio_event' => 'julio_event',
   );
+  $handler->display->display_options['filters']['type']['group'] = 1;
   /* Filter criterion: Content: Event date -  start date (field_julio_event_date) */
   $handler->display->display_options['filters']['field_julio_event_date_value']['id'] = 'field_julio_event_date_value';
   $handler->display->display_options['filters']['field_julio_event_date_value']['table'] = 'field_data_field_julio_event_date';
   $handler->display->display_options['filters']['field_julio_event_date_value']['field'] = 'field_julio_event_date_value';
   $handler->display->display_options['filters']['field_julio_event_date_value']['operator'] = '>=';
+  $handler->display->display_options['filters']['field_julio_event_date_value']['group'] = 1;
   $handler->display->display_options['filters']['field_julio_event_date_value']['default_date'] = 'now';
   /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type_1']['id'] = 'type_1';
@@ -183,8 +189,16 @@ function julio_departments_events_views_default_views() {
   $handler->display->display_options['filters']['type_1']['field'] = 'type';
   $handler->display->display_options['filters']['type_1']['relationship'] = 'og_membership_related_node_group';
   $handler->display->display_options['filters']['type_1']['value'] = array(
-    'julio_team' => 'julio_team',
+    'julio_department' => 'julio_department',
   );
+  $handler->display->display_options['filters']['type_1']['group'] = 2;
+  /* Filter criterion: OG membership: Group ID */
+  $handler->display->display_options['filters']['gid']['id'] = 'gid';
+  $handler->display->display_options['filters']['gid']['table'] = 'og_membership';
+  $handler->display->display_options['filters']['gid']['field'] = 'gid';
+  $handler->display->display_options['filters']['gid']['relationship'] = 'og_membership_rel';
+  $handler->display->display_options['filters']['gid']['value']['value'] = variable_get('julio_departments_nid', 0);
+  $handler->display->display_options['filters']['gid']['group'] = 2;
 
   /* Display: Page */
   $handler = $view->new_display('page', 'Page', 'page');
@@ -271,6 +285,7 @@ function julio_departments_events_views_default_views() {
   $handler->display->display_options['filters']['type']['value'] = array(
     'julio_event' => 'julio_event',
   );
+  $handler->display->display_options['filters']['type']['group'] = 1;
   /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type_1']['id'] = 'type_1';
   $handler->display->display_options['filters']['type_1']['table'] = 'node';
@@ -279,6 +294,14 @@ function julio_departments_events_views_default_views() {
   $handler->display->display_options['filters']['type_1']['value'] = array(
     'julio_department' => 'julio_department',
   );
+  $handler->display->display_options['filters']['type_1']['group'] = 2;
+  /* Filter criterion: OG membership: Group ID */
+  $handler->display->display_options['filters']['gid']['id'] = 'gid';
+  $handler->display->display_options['filters']['gid']['table'] = 'og_membership';
+  $handler->display->display_options['filters']['gid']['field'] = 'gid';
+  $handler->display->display_options['filters']['gid']['relationship'] = 'og_membership_rel';
+  $handler->display->display_options['filters']['gid']['value']['value'] = variable_get('julio_departments_nid', 0);
+  $handler->display->display_options['filters']['gid']['group'] = 2;
   $handler->display->display_options['path'] = 'departments/calendar';
 
   /* Display: Upcoming - All */
diff --git a/modules/julio_departments/modules/julio_departments_events_ui/julio_departments_events_ui.context.inc b/modules/julio_departments/modules/julio_departments_events_ui/julio_departments_events_ui.context.inc
index 15ca146..61e731e 100644
--- a/modules/julio_departments/modules/julio_departments_events_ui/julio_departments_events_ui.context.inc
+++ b/modules/julio_departments/modules/julio_departments_events_ui/julio_departments_events_ui.context.inc
@@ -19,7 +19,7 @@ function julio_departments_events_ui_context_default_contexts() {
   $context->conditions = array(
     'menu' => array(
       'values' => array(
-        'node/6' => 'node/6',
+        'node/' . variable_get('julio_departments_nid', 0) => 'node/' . variable_get('julio_departments_nid', 0),
       ),
     ),
   );
diff --git a/modules/julio_teams/modules/julio_teams_announcements/julio_teams_announcements.views_default.inc b/modules/julio_teams/modules/julio_teams_announcements/julio_teams_announcements.views_default.inc
index 8d93300..f372595 100644
--- a/modules/julio_teams/modules/julio_teams_announcements/julio_teams_announcements.views_default.inc
+++ b/modules/julio_teams/modules/julio_teams_announcements/julio_teams_announcements.views_default.inc
@@ -79,6 +79,10 @@ function julio_teams_announcements_views_default_views() {
   $handler->display->display_options['sorts']['created']['table'] = 'node';
   $handler->display->display_options['sorts']['created']['field'] = 'created';
   $handler->display->display_options['sorts']['created']['order'] = 'DESC';
+  $handler->display->display_options['filter_groups']['groups'] = array(
+    1 => 'AND',
+    2 => 'OR',
+  );
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
@@ -93,6 +97,7 @@ function julio_teams_announcements_views_default_views() {
   $handler->display->display_options['filters']['type']['value'] = array(
     'julio_announcement' => 'julio_announcement',
   );
+  $handler->display->display_options['filters']['type']['group'] = 1;
   /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type_1']['id'] = 'type_1';
   $handler->display->display_options['filters']['type_1']['table'] = 'node';
@@ -101,6 +106,14 @@ function julio_teams_announcements_views_default_views() {
   $handler->display->display_options['filters']['type_1']['value'] = array(
     'julio_team' => 'julio_team',
   );
+  $handler->display->display_options['filters']['type_1']['group'] = 2;
+  /* Filter criterion: OG membership: Group ID */
+  $handler->display->display_options['filters']['gid']['id'] = 'gid';
+  $handler->display->display_options['filters']['gid']['table'] = 'og_membership';
+  $handler->display->display_options['filters']['gid']['field'] = 'gid';
+  $handler->display->display_options['filters']['gid']['relationship'] = 'og_membership_rel';
+  $handler->display->display_options['filters']['gid']['value']['value'] = variable_get('julio_teams_nid', 0);
+  $handler->display->display_options['filters']['gid']['group'] = 2;
 
   /* Display: Page */
   $handler = $view->new_display('page', 'Page', 'page');
@@ -170,29 +183,6 @@ function julio_teams_announcements_views_default_views() {
     'multiple_to' => '',
   );
   $handler->display->display_options['fields']['field_julio_event_date']['field_api_classes'] = 0;
-  $handler->display->display_options['defaults']['filters'] = FALSE;
-  /* Filter criterion: Content: Published */
-  $handler->display->display_options['filters']['status']['id'] = 'status';
-  $handler->display->display_options['filters']['status']['table'] = 'node';
-  $handler->display->display_options['filters']['status']['field'] = 'status';
-  $handler->display->display_options['filters']['status']['value'] = 1;
-  $handler->display->display_options['filters']['status']['group'] = 1;
-  $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
-  /* Filter criterion: Content: Type */
-  $handler->display->display_options['filters']['type']['id'] = 'type';
-  $handler->display->display_options['filters']['type']['table'] = 'node';
-  $handler->display->display_options['filters']['type']['field'] = 'type';
-  $handler->display->display_options['filters']['type']['value'] = array(
-    'julio_announcement' => 'julio_announcement',
-  );
-  /* Filter criterion: Content: Type */
-  $handler->display->display_options['filters']['type_1']['id'] = 'type_1';
-  $handler->display->display_options['filters']['type_1']['table'] = 'node';
-  $handler->display->display_options['filters']['type_1']['field'] = 'type';
-  $handler->display->display_options['filters']['type_1']['relationship'] = 'og_membership_related_node_group';
-  $handler->display->display_options['filters']['type_1']['value'] = array(
-    'julio_team' => 'julio_team',
-  );
   $handler->display->display_options['path'] = 'teams/announcements';
 
   /* Display: Athletics News */
diff --git a/modules/julio_teams/modules/julio_teams_announcements_ui/julio_teams_announcements_ui.context.inc b/modules/julio_teams/modules/julio_teams_announcements_ui/julio_teams_announcements_ui.context.inc
index abc2b78..ffa6b7f 100644
--- a/modules/julio_teams/modules/julio_teams_announcements_ui/julio_teams_announcements_ui.context.inc
+++ b/modules/julio_teams/modules/julio_teams_announcements_ui/julio_teams_announcements_ui.context.inc
@@ -19,7 +19,7 @@ function julio_teams_announcements_ui_context_default_contexts() {
   $context->conditions = array(
     'menu' => array(
       'values' => array(
-        'node/9' => 'node/9',
+        'node/' . variable_get('julio_teams_nid', 0) => 'node/' . variable_get('julio_teams_nid', 0),
       ),
     ),
   );
diff --git a/modules/julio_teams/modules/julio_teams_events/julio_teams_events.views_default.inc b/modules/julio_teams/modules/julio_teams_events/julio_teams_events.views_default.inc
index f3320ff..abcf0bc 100644
--- a/modules/julio_teams/modules/julio_teams_events/julio_teams_events.views_default.inc
+++ b/modules/julio_teams/modules/julio_teams_events/julio_teams_events.views_default.inc
@@ -157,6 +157,10 @@ function julio_teams_events_views_default_views() {
   $handler->display->display_options['sorts']['field_julio_event_date_value']['id'] = 'field_julio_event_date_value';
   $handler->display->display_options['sorts']['field_julio_event_date_value']['table'] = 'field_data_field_julio_event_date';
   $handler->display->display_options['sorts']['field_julio_event_date_value']['field'] = 'field_julio_event_date_value';
+  $handler->display->display_options['filter_groups']['groups'] = array(
+    1 => 'AND',
+    2 => 'OR',
+  );
   /* Filter criterion: Content: Published */
   $handler->display->display_options['filters']['status']['id'] = 'status';
   $handler->display->display_options['filters']['status']['table'] = 'node';
@@ -171,11 +175,13 @@ function julio_teams_events_views_default_views() {
   $handler->display->display_options['filters']['type']['value'] = array(
     'julio_event' => 'julio_event',
   );
+  $handler->display->display_options['filters']['type']['group'] = 1;
   /* Filter criterion: Content: Event date -  start date (field_julio_event_date) */
   $handler->display->display_options['filters']['field_julio_event_date_value']['id'] = 'field_julio_event_date_value';
   $handler->display->display_options['filters']['field_julio_event_date_value']['table'] = 'field_data_field_julio_event_date';
   $handler->display->display_options['filters']['field_julio_event_date_value']['field'] = 'field_julio_event_date_value';
   $handler->display->display_options['filters']['field_julio_event_date_value']['operator'] = '>=';
+  $handler->display->display_options['filters']['field_julio_event_date_value']['group'] = 1;
   $handler->display->display_options['filters']['field_julio_event_date_value']['default_date'] = 'now';
   /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type_1']['id'] = 'type_1';
@@ -185,6 +191,14 @@ function julio_teams_events_views_default_views() {
   $handler->display->display_options['filters']['type_1']['value'] = array(
     'julio_team' => 'julio_team',
   );
+  $handler->display->display_options['filters']['type_1']['group'] = 2;
+  /* Filter criterion: OG membership: Group ID */
+  $handler->display->display_options['filters']['gid']['id'] = 'gid';
+  $handler->display->display_options['filters']['gid']['table'] = 'og_membership';
+  $handler->display->display_options['filters']['gid']['field'] = 'gid';
+  $handler->display->display_options['filters']['gid']['relationship'] = 'og_membership_rel';
+  $handler->display->display_options['filters']['gid']['value']['value'] = variable_get('julio_teams_nid', 0);
+  $handler->display->display_options['filters']['gid']['group'] = 2;
 
   /* Display: Page */
   $handler = $view->new_display('page', 'Page', 'page');
@@ -271,6 +285,7 @@ function julio_teams_events_views_default_views() {
   $handler->display->display_options['filters']['type']['value'] = array(
     'julio_event' => 'julio_event',
   );
+  $handler->display->display_options['filters']['type']['group'] = 1;
   /* Filter criterion: Content: Type */
   $handler->display->display_options['filters']['type_1']['id'] = 'type_1';
   $handler->display->display_options['filters']['type_1']['table'] = 'node';
@@ -279,6 +294,14 @@ function julio_teams_events_views_default_views() {
   $handler->display->display_options['filters']['type_1']['value'] = array(
     'julio_team' => 'julio_team',
   );
+  $handler->display->display_options['filters']['type_1']['group'] = 2;
+  /* Filter criterion: OG membership: Group ID */
+  $handler->display->display_options['filters']['gid']['id'] = 'gid';
+  $handler->display->display_options['filters']['gid']['table'] = 'og_membership';
+  $handler->display->display_options['filters']['gid']['field'] = 'gid';
+  $handler->display->display_options['filters']['gid']['relationship'] = 'og_membership_rel';
+  $handler->display->display_options['filters']['gid']['value']['value'] = variable_get('julio_teams_nid', 0);
+  $handler->display->display_options['filters']['gid']['group'] = 2;
   $handler->display->display_options['path'] = 'teams/calendar';
 
   /* Display: Upcoming - All */
diff --git a/modules/julio_teams/modules/julio_teams_events_ui/julio_teams_events_ui.context.inc b/modules/julio_teams/modules/julio_teams_events_ui/julio_teams_events_ui.context.inc
index a52a1de..bac856b 100644
--- a/modules/julio_teams/modules/julio_teams_events_ui/julio_teams_events_ui.context.inc
+++ b/modules/julio_teams/modules/julio_teams_events_ui/julio_teams_events_ui.context.inc
@@ -19,7 +19,7 @@ function julio_teams_events_ui_context_default_contexts() {
   $context->conditions = array(
     'menu' => array(
       'values' => array(
-        'node/9' => 'node/9',
+        'node/' . variable_get('julio_teams_nid', 0) => 'node/' . variable_get('julio_teams_nid', 0),
       ),
     ),
   );