diff --git a/drupal/sites/all/features/boinc_standard/boinc_standard.strongarm.inc b/drupal/sites/all/features/boinc_standard/boinc_standard.strongarm.inc
index a2b754de90..60250f5d10 100644
--- a/drupal/sites/all/features/boinc_standard/boinc_standard.strongarm.inc
+++ b/drupal/sites/all/features/boinc_standard/boinc_standard.strongarm.inc
@@ -892,16 +892,16 @@ function boinc_standard_strongarm() {
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'user_mail_password_reset_body';
-  $strongarm->value = '!username,
-
-A request to reset the password for your account has been made at !site.
-
-You may now log in to !uri_brief by clicking on this link or copying and pasting it in your browser:
-
-!login_url
-
-This is a one-time login, so it can be used only once. It expires after one day and nothing will happen if it\'s not used.
-
+  $strongarm->value = '!username,
+
+A request to reset the password for your account has been made at !site.
+
+You may now log in to !uri_brief by clicking on this link or copying and pasting it in your browser:
+
+!login_url
+
+This is a one-time login, so it can be used only once. It expires after one day and nothing will happen if it\'s not used.
+
 After logging in, you will be redirected to !edit_uri so you can change your password.';
   $export['user_mail_password_reset_body'] = $strongarm;
 
@@ -916,22 +916,22 @@ After logging in, you will be redirected to !edit_uri so you can change your pas
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'user_mail_register_admin_created_body';
-  $strongarm->value = '!username,
-
-A site administrator at !site has created an account for you. You may now log in to !login_uri using the following username and password:
-
-username: !username
-password: !password
-
-You may also log in by clicking on this link or copying and pasting it in your browser:
-
-!login_url
-
-This is a one-time login, so it can be used only once.
-
-After logging in, you will be redirected to !edit_uri so you can change your password.
-
-
+  $strongarm->value = '!username,
+
+A site administrator at !site has created an account for you. You may now log in to !login_uri using the following username and password:
+
+username: !username
+password: !password
+
+You may also log in by clicking on this link or copying and pasting it in your browser:
+
+!login_url
+
+This is a one-time login, so it can be used only once.
+
+After logging in, you will be redirected to !edit_uri so you can change your password.
+
+
 --  !site team';
   $export['user_mail_register_admin_created_body'] = $strongarm;
 
@@ -946,22 +946,22 @@ After logging in, you will be redirected to !edit_uri so you can change your pas
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'user_mail_register_no_approval_required_body';
-  $strongarm->value = '!username,
-
-Thank you for registering at !site. You may now log in to !login_uri using the following username and password:
-
-username: !username
-password: !password
-
-You may also log in by clicking on this link or copying and pasting it in your browser:
-
-!login_url
-
-This is a one-time login, so it can be used only once.
-
-After logging in, you will be redirected to !edit_uri so you can change your password.
-
-
+  $strongarm->value = '!username,
+
+Thank you for registering at !site. You may now log in to !login_uri using the following username and password:
+
+username: !username
+password: !password
+
+You may also log in by clicking on this link or copying and pasting it in your browser:
+
+!login_url
+
+This is a one-time login, so it can be used only once.
+
+After logging in, you will be redirected to !edit_uri so you can change your password.
+
+
 --  !site team';
   $export['user_mail_register_no_approval_required_body'] = $strongarm;
 
@@ -976,11 +976,11 @@ After logging in, you will be redirected to !edit_uri so you can change your pas
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'user_mail_register_pending_approval_body';
-  $strongarm->value = '!username,
-
-Thank you for registering at !site. Your application for an account is currently pending approval. Once it has been approved, you will receive another e-mail containing information about how to log in, set your password, and other details.
-
-
+  $strongarm->value = '!username,
+
+Thank you for registering at !site. Your application for an account is currently pending approval. Once it has been approved, you will receive another e-mail containing information about how to log in, set your password, and other details.
+
+
 --  !site team';
   $export['user_mail_register_pending_approval_body'] = $strongarm;
 
@@ -995,21 +995,21 @@ Thank you for registering at !site. Your application for an account is currently
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'user_mail_status_activated_body';
-  $strongarm->value = '!username,
-
-Your account at !site has been activated.
-
-You may now log in by clicking on this link or copying and pasting it in your browser:
-
-!login_url
-
-This is a one-time login, so it can be used only once.
-
-After logging in, you will be redirected to !edit_uri so you can change your password.
-
-Once you have set your own password, you will be able to log in to !login_uri in the future using:
-
-username: !username
+  $strongarm->value = '!username,
+
+Your account at !site has been activated.
+
+You may now log in by clicking on this link or copying and pasting it in your browser:
+
+!login_url
+
+This is a one-time login, so it can be used only once.
+
+After logging in, you will be redirected to !edit_uri so you can change your password.
+
+Once you have set your own password, you will be able to log in to !login_uri in the future using:
+
+username: !username
 ';
   $export['user_mail_status_activated_body'] = $strongarm;
 
@@ -1031,8 +1031,8 @@ username: !username
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'user_mail_status_blocked_body';
-  $strongarm->value = '!username,
-
+  $strongarm->value = '!username,
+
 Your account on !site has been blocked.';
   $export['user_mail_status_blocked_body'] = $strongarm;
 
@@ -1054,8 +1054,8 @@ Your account on !site has been blocked.';
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'user_mail_status_deleted_body';
-  $strongarm->value = '!username,
-
+  $strongarm->value = '!username,
+
 Your account on !site has been deleted.';
   $export['user_mail_status_deleted_body'] = $strongarm;
 
diff --git a/drupal/sites/all/features/discussion_forums/discussion_forums.features.fe_block_settings.inc b/drupal/sites/all/features/discussion_forums/discussion_forums.features.fe_block_settings.inc
index 9deee3c6b4..0773b3ed71 100644
--- a/drupal/sites/all/features/discussion_forums/discussion_forums.features.fe_block_settings.inc
+++ b/drupal/sites/all/features/discussion_forums/discussion_forums.features.fe_block_settings.inc
@@ -19,26 +19,26 @@ function discussion_forums_default_fe_block_settings() {
     'custom' => '0',
     'throttle' => '0',
     'visibility' => '2',
-    'pages' => '<?php
-  // Only show if $match is true
-  $match = FALSE;
-
-  // Which node types
-  $types = array(\'forum\', \'team_forum\');
-
-  // Match current node type with array of types
-  if (arg(0) == \'node\' && is_numeric(arg(1))) {
-    $nid = arg(1);
-    $node = node_load(array(\'nid\' => $nid));
-    $type = $node->type; 
-    $match |= in_array($type, $types);
-    // Don\'t show if comments aren\'t enabled...
-    if ($node->comment != 2) {
-      $match = FALSE;
-    }
-  }
-
-  return $match;
+    'pages' => '<?php
+  // Only show if $match is true
+  $match = FALSE;
+
+  // Which node types
+  $types = array(\'forum\', \'team_forum\');
+
+  // Match current node type with array of types
+  if (arg(0) == \'node\' && is_numeric(arg(1))) {
+    $nid = arg(1);
+    $node = node_load(array(\'nid\' => $nid));
+    $type = $node->type; 
+    $match |= in_array($type, $types);
+    // Don\'t show if comments aren\'t enabled...
+    if ($node->comment != 2) {
+      $match = FALSE;
+    }
+  }
+
+  return $match;
 ?>',
     'title' => '',
     'cache' => '1',
@@ -59,26 +59,26 @@ function discussion_forums_default_fe_block_settings() {
     'custom' => '0',
     'throttle' => '0',
     'visibility' => '2',
-    'pages' => '<?php
-  // Only show if $match is true
-  $match = FALSE;
-
-  // Which node types
-  $types = array(\'forum\', \'team_forum\');
-
-  // Match current node type with array of types
-  if (arg(0) == \'node\' && is_numeric(arg(1))) {
-    $nid = arg(1);
-    $node = node_load(array(\'nid\' => $nid));
-    $type = $node->type; 
-    $match |= in_array($type, $types);
-    // Don\'t show if comments aren\'t enabled...
-    if ($node->comment != 2) {
-      $match = FALSE;
-    }
-  }
-
-  return $match;
+    'pages' => '<?php
+  // Only show if $match is true
+  $match = FALSE;
+
+  // Which node types
+  $types = array(\'forum\', \'team_forum\');
+
+  // Match current node type with array of types
+  if (arg(0) == \'node\' && is_numeric(arg(1))) {
+    $nid = arg(1);
+    $node = node_load(array(\'nid\' => $nid));
+    $type = $node->type; 
+    $match |= in_array($type, $types);
+    // Don\'t show if comments aren\'t enabled...
+    if ($node->comment != 2) {
+      $match = FALSE;
+    }
+  }
+
+  return $match;
 ?>',
     'title' => '',
     'cache' => '1',
@@ -99,26 +99,26 @@ function discussion_forums_default_fe_block_settings() {
     'custom' => '0',
     'throttle' => '0',
     'visibility' => '2',
-    'pages' => '<?php
-  // Only show if $match is true
-  $match = FALSE;
-
-  // Which node types
-  $types = array(\'forum\', \'team_forum\');
-
-  // Match current node type with array of types
-  if (arg(0) == \'node\' && is_numeric(arg(1))) {
-    $nid = arg(1);
-    $node = node_load(array(\'nid\' => $nid));
-    $type = $node->type; 
-    $match |= in_array($type, $types);
-    // Don\'t show if comments aren\'t enabled...
-    if ($node->comment != 2) {
-      $match = FALSE;
-    }
-  }
-
-  return $match;
+    'pages' => '<?php
+  // Only show if $match is true
+  $match = FALSE;
+
+  // Which node types
+  $types = array(\'forum\', \'team_forum\');
+
+  // Match current node type with array of types
+  if (arg(0) == \'node\' && is_numeric(arg(1))) {
+    $nid = arg(1);
+    $node = node_load(array(\'nid\' => $nid));
+    $type = $node->type; 
+    $match |= in_array($type, $types);
+    // Don\'t show if comments aren\'t enabled...
+    if ($node->comment != 2) {
+      $match = FALSE;
+    }
+  }
+
+  return $match;
 ?>',
     'title' => '',
     'cache' => '1',
diff --git a/drupal/sites/all/features/news/news.features.fe_block_settings.inc b/drupal/sites/all/features/news/news.features.fe_block_settings.inc
index bff6e93010..42fde4d6fe 100644
--- a/drupal/sites/all/features/news/news.features.fe_block_settings.inc
+++ b/drupal/sites/all/features/news/news.features.fe_block_settings.inc
@@ -19,22 +19,22 @@ function news_default_fe_block_settings() {
     'custom' => '0',
     'throttle' => '0',
     'visibility' => '2',
-    'pages' => '<?php
-  // Only show if $match is true
-  $match = FALSE;
-
-  // Which node types
-  $types = array(\'news\');
-
-  // Match current node type with array of types
-  if (arg(0) == \'node\' && is_numeric(arg(1))) {
-    $nid = arg(1);
-    $node = node_load(array(\'nid\' => $nid));
-    $type = $node->type; 
-    $match |= in_array($type, $types);
-  }
-
-  return $match;
+    'pages' => '<?php
+  // Only show if $match is true
+  $match = FALSE;
+
+  // Which node types
+  $types = array(\'news\');
+
+  // Match current node type with array of types
+  if (arg(0) == \'node\' && is_numeric(arg(1))) {
+    $nid = arg(1);
+    $node = node_load(array(\'nid\' => $nid));
+    $type = $node->type; 
+    $match |= in_array($type, $types);
+  }
+
+  return $match;
 ?>',
     'title' => '',
     'cache' => '1',
@@ -55,22 +55,22 @@ function news_default_fe_block_settings() {
     'custom' => '0',
     'throttle' => '0',
     'visibility' => '2',
-    'pages' => '<?php
-  // Only show if $match is true
-  $match = FALSE;
-
-  // Which node types
-  $types = array(\'news\');
-
-  // Match current node type with array of types
-  if (arg(0) == \'node\' && is_numeric(arg(1))) {
-    $nid = arg(1);
-    $node = node_load(array(\'nid\' => $nid));
-    $type = $node->type; 
-    $match |= in_array($type, $types);
-  }
-
-  return $match;
+    'pages' => '<?php
+  // Only show if $match is true
+  $match = FALSE;
+
+  // Which node types
+  $types = array(\'news\');
+
+  // Match current node type with array of types
+  if (arg(0) == \'node\' && is_numeric(arg(1))) {
+    $nid = arg(1);
+    $node = node_load(array(\'nid\' => $nid));
+    $type = $node->type; 
+    $match |= in_array($type, $types);
+  }
+
+  return $match;
 ?>',
     'title' => '',
     'cache' => '1',
@@ -91,22 +91,22 @@ function news_default_fe_block_settings() {
     'custom' => '0',
     'throttle' => '0',
     'visibility' => '2',
-    'pages' => '<?php
-  // Only show if $match is true
-  $match = FALSE;
-
-  // Which node types
-  $types = array(\'news\');
-
-  // Match current node type with array of types
-  if (arg(0) == \'node\' && is_numeric(arg(1))) {
-    $nid = arg(1);
-    $node = node_load(array(\'nid\' => $nid));
-    $type = $node->type; 
-    $match |= in_array($type, $types);
-  }
-
-  return $match;
+    'pages' => '<?php
+  // Only show if $match is true
+  $match = FALSE;
+
+  // Which node types
+  $types = array(\'news\');
+
+  // Match current node type with array of types
+  if (arg(0) == \'node\' && is_numeric(arg(1))) {
+    $nid = arg(1);
+    $node = node_load(array(\'nid\' => $nid));
+    $type = $node->type; 
+    $match |= in_array($type, $types);
+  }
+
+  return $match;
 ?>',
     'title' => '',
     'cache' => '1',
diff --git a/drupal/sites/all/features/teams/teams.views_default.inc b/drupal/sites/all/features/teams/teams.views_default.inc
index ad336678e5..84c1464ce8 100644
--- a/drupal/sites/all/features/teams/teams.views_default.inc
+++ b/drupal/sites/all/features/teams/teams.views_default.inc
@@ -349,8 +349,8 @@ function teams_views_default_views() {
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'value' => '<?php
-  echo boincuser_lookup_uid($data->id);
+      'value' => '<?php
+  echo boincuser_lookup_uid($data->id);
 ?>',
       'exclude' => 1,
       'id' => 'phpcode',
@@ -820,8 +820,8 @@ function teams_views_default_views() {
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'value' => '<?php
-  echo boincuser_lookup_uid($data->id);
+      'value' => '<?php
+  echo boincuser_lookup_uid($data->id);
 ?>',
       'exclude' => 1,
       'id' => 'phpcode_2',
diff --git a/drupal/sites/all/features/user_account_host_list/user_account_host_list.views_default.inc b/drupal/sites/all/features/user_account_host_list/user_account_host_list.views_default.inc
index 0f21ab0114..8dfba79f5e 100644
--- a/drupal/sites/all/features/user_account_host_list/user_account_host_list.views_default.inc
+++ b/drupal/sites/all/features/user_account_host_list/user_account_host_list.views_default.inc
@@ -152,18 +152,18 @@ function user_account_host_list_views_default_views() {
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'value' => '<?php
-  require_boinc(\'stats_sites\');
-  global $host_sites;
-  $x = "";
-  foreach ($host_sites as $h) {
-    $url = $h[0];
-    $name = $h[1];
-    $img = $h[2];
-    $site_img = theme_image("sites/all/themes/einstein/shared/{$img}", $name, $name);
-    $x .= l($site_img, $url . $data->host_host_cpid, array(\'html\' => TRUE));
-  }
-  echo "Cross-project stats: {$x}";
+      'value' => '<?php
+  require_boinc(\'stats_sites\');
+  global $host_sites;
+  $x = "";
+  foreach ($host_sites as $h) {
+    $url = $h[0];
+    $name = $h[1];
+    $img = $h[2];
+    $site_img = theme_image("sites/all/themes/einstein/shared/{$img}", $name, $name);
+    $x .= l($site_img, $url . $data->host_host_cpid, array(\'html\' => TRUE));
+  }
+  echo "Cross-project stats: {$x}";
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_4',
@@ -366,9 +366,9 @@ function user_account_host_list_views_default_views() {
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'value' => '<?php
-  require_boinc(\'host\');
-  echo boinc_version($data->host_serialnum);
+      'value' => '<?php
+  require_boinc(\'host\');
+  echo boinc_version($data->host_serialnum);
 ?>',
       'exclude' => 0,
       'id' => 'phpcode',
@@ -486,9 +486,9 @@ function user_account_host_list_views_default_views() {
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'value' => '<?php
-  require_boinc(\'host\');
-  echo gpu_desc($data->host_serialnum);
+      'value' => '<?php
+  require_boinc(\'host\');
+  echo gpu_desc($data->host_serialnum);
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_1',
@@ -1443,10 +1443,10 @@ function user_account_host_list_views_default_views() {
       ),
       'default_argument_user' => 0,
       'default_argument_fixed' => '',
-      'default_argument_php' => 'if (arg(0) == \'account\' AND arg(1) == \'prefs\') {
-  $venue = arg(4);
-  if ($venue == \'default\') $venue = null;
-}
+      'default_argument_php' => 'if (arg(0) == \'account\' AND arg(1) == \'prefs\') {
+  $venue = arg(4);
+  if ($venue == \'default\') $venue = null;
+}
 return $venue;',
       'validate_argument_node_type' => array(
         'forum' => 0,
diff --git a/drupal/sites/all/features/user_profiles/user_profiles.features.content.inc b/drupal/sites/all/features/user_profiles/user_profiles.features.content.inc
index 7bd3b08bc0..29f927f663 100644
--- a/drupal/sites/all/features/user_profiles/user_profiles.features.content.inc
+++ b/drupal/sites/all/features/user_profiles/user_profiles.features.content.inc
@@ -110,238 +110,238 @@ function user_profiles_content_default_fields() {
     'active' => '1',
     'text_processing' => '0',
     'max_length' => '',
-    'allowed_values' => 'None|None
-International|International
-Afghanistan|Afghanistan
-Albania|Albania
-Algeria|Algeria
-American Samoa|American Samoa
-Andorra|Andorra
-Angola|Angola
-Anguilla|Anguilla
-Antarctica|Antarctica
-Antigua and Barbuda|Antigua and Barbuda
-Argentina|Argentina
-Armenia|Armenia
-Aruba|Aruba
-Australia|Australia
-Austria|Austria
-Azerbaijan|Azerbaijan
-Bahamas, The|Bahamas, The
-Bahrain|Bahrain
-Bangladesh|Bangladesh
-Barbados|Barbados
-Belarus|Belarus
-Belgium|Belgium
-Belize|Belize
-Benin|Benin
-Bermuda|Bermuda
-Bhutan|Bhutan
-Bolivia|Bolivia
-Bosnia and Herzegovina|Bosnia and Herzegovina
-Botswana|Botswana
-Brazil|Brazil
-British Virgin Islands|British Virgin Islands
-Brunei|Brunei
-Bulgaria|Bulgaria
-Burkina Faso|Burkina Faso
-Burma|Burma
-Burundi|Burundi
-Cambodia|Cambodia
-Cameroon|Cameroon
-Canada|Canada
-Cape Verde|Cape Verde
-Cayman Islands|Cayman Islands
-Central African Republic|Central African Republic
-Chad|Chad
-Channel Islands|Channel Islands
-Chile|Chile
-China|China
-Colombia|Colombia
-Comoros|Comoros
-Congo, Democratic Republic of the|Congo, Democratic Republic of the
-Congo, Republic of the|Congo, Republic of the
-Cook Islands|Cook Islands
-Costa Rica|Costa Rica
-Cote d\'Ivoire|Cote d\'Ivoire
-Croatia|Croatia
-Cuba|Cuba
-Cyprus|Cyprus
-Czech Republic|Czech Republic
-Denmark|Denmark
-Djibouti|Djibouti
-Dominica|Dominica
-Dominican Republic|Dominican Republic
-East Timor|East Timor
-Ecuador|Ecuador
-Egypt|Egypt
-El Salvador|El Salvador
-Equatorial Guinea|Equatorial Guinea
-Eritrea|Eritrea
-Estonia|Estonia
-Ethiopia|Ethiopia
-Falkland Islands|Falkland Islands
-Faroe Islands|Faroe Islands
-Fiji|Fiji
-Finland|Finland
-France|France
-French Guiana|French Guiana
-French Polynesia|French Polynesia
-Gabon|Gabon
-Gambia, The|Gambia, The
-Gaza Strip|Gaza Strip
-Georgia|Georgia
-Germany|Germany
-Ghana|Ghana
-Gibraltar|Gibraltar
-Greece|Greece
-Greenland|Greenland
-Grenada|Grenada
-Guadeloupe|Guadeloupe
-Guam|Guam
-Guatemala|Guatemala
-Guinea|Guinea
-Guinea-Bissau|Guinea-Bissau
-Guyana|Guyana
-Haiti|Haiti
-Holy See (Vatican City)|Holy See (Vatican City)
-Honduras|Honduras
-Hong Kong|Hong Kong
-Hungary|Hungary
-Iceland|Iceland
-India|India
-Indonesia|Indonesia
-Iran|Iran
-Iraq|Iraq
-Ireland|Ireland
-Isle of Man|Isle of Man
-Israel|Israel
-Italy|Italy
-Jamaica|Jamaica
-Japan|Japan
-Jordan|Jordan
-Kazakhstan|Kazakhstan
-Korea, North|Korea, North
-Korea, South|Korea, South
-Kenya|Kenya
-Kiribati|Kiribati
-Kuwait|Kuwait
-Kyrgyzstan|Kyrgyzstan
-Laos|Laos
-Latvia|Latvia
-Lebanon|Lebanon
-Lesotho|Lesotho
-Liberia|Liberia
-Libya|Libya
-Liechtenstein|Liechtenstein
-Lithuania|Lithuania
-Luxembourg|Luxembourg
-Macau|Macau
-Macedonia|Macedonia
-Madagascar|Madagascar
-Malawi|Malawi
-Malaysia|Malaysia
-Maldives|Maldives
-Mali|Mali
-Malta|Malta
-Marshall Islands|Marshall Islands
-Martinique|Martinique
-Mauritania|Mauritania
-Mauritius|Mauritius
-Mexico|Mexico
-Micronesia|Micronesia
-Moldova|Moldova
-Monaco|Monaco
-Mongolia|Mongolia
-Montenegro|Montenegro
-Montserrat|Montserrat
-Morocco|Morocco
-Mozambique|Mozambique
-Namibia|Namibia
-Nauru|Nauru
-Nepal|Nepal
-Netherlands|Netherlands
-Netherlands Antilles|Netherlands Antilles
-New Caledonia|New Caledonia
-New Zealand|New Zealand
-Nicaragua|Nicaragua
-Niger|Niger
-Nigeria|Nigeria
-Niue|Niue
-Northern Mariana Islands|Northern Mariana Islands
-Norway|Norway
-Oman|Oman
-Pakistan|Pakistan
-Palau|Palau
-Panama|Panama
-Papua New Guinea|Papua New Guinea
-Paraguay|Paraguay
-Peru|Peru
-Philippines|Philippines
-Pitcairn Islands|Pitcairn Islands
-Poland|Poland
-Portugal|Portugal
-Puerto Rico|Puerto Rico
-Qatar|Qatar
-Reunion|Reunion
-Romania|Romania
-Russia|Russia
-Rwanda|Rwanda
-Saint Kitts and Nevis|Saint Kitts and Nevis
-Saint Lucia|Saint Lucia
-Saint Pierre and Miquelon|Saint Pierre and Miquelon
-Saint Vincent and the Grenadines|Saint Vincent and the Grenadines
-Samoa|Samoa
-San Marino|San Marino
-Sao Tome and Principe|Sao Tome and Principe
-Saudi Arabia|Saudi Arabia
-Senegal|Senegal
-Serbia|Serbia
-Seychelles|Seychelles
-Sierra Leone|Sierra Leone
-Singapore|Singapore
-Slovakia|Slovakia
-Slovenia|Slovenia
-Solomon Islands|Solomon Islands
-Somalia|Somalia
-South Africa|South Africa
-Spain|Spain
-Sri Lanka|Sri Lanka
-Sudan|Sudan
-Suriname|Suriname
-Swaziland|Swaziland
-Sweden|Sweden
-Switzerland|Switzerland
-Syria|Syria
-Taiwan|Taiwan
-Tajikistan|Tajikistan
-Tanzania|Tanzania
-Thailand|Thailand
-Togo|Togo
-Tokelau|Tokelau
-Tonga|Tonga
-Trinidad and Tobago|Trinidad and Tobago
-Tunisia|Tunisia
-Turkey|Turkey
-Turkmenistan|Turkmenistan
-Turks and Caicos Islands|Turks and Caicos Islands
-Tuvalu|Tuvalu
-Uganda|Uganda
-Ukraine|Ukraine
-United Arab Emirates|United Arab Emirates
-United Kingdom|United Kingdom
-United States|United States
-Uruguay|Uruguay
-Uzbekistan|Uzbekistan
-Vanuatu|Vanuatu
-Venezuela|Venezuela
-Vietnam|Vietnam
-Virgin Islands|Virgin Islands
-Wallis and Futuna|Wallis and Futuna
-West Bank|West Bank
-Western Sahara|Western Sahara
-Yemen|Yemen
-Zambia|Zambia
+    'allowed_values' => 'None|None
+International|International
+Afghanistan|Afghanistan
+Albania|Albania
+Algeria|Algeria
+American Samoa|American Samoa
+Andorra|Andorra
+Angola|Angola
+Anguilla|Anguilla
+Antarctica|Antarctica
+Antigua and Barbuda|Antigua and Barbuda
+Argentina|Argentina
+Armenia|Armenia
+Aruba|Aruba
+Australia|Australia
+Austria|Austria
+Azerbaijan|Azerbaijan
+Bahamas, The|Bahamas, The
+Bahrain|Bahrain
+Bangladesh|Bangladesh
+Barbados|Barbados
+Belarus|Belarus
+Belgium|Belgium
+Belize|Belize
+Benin|Benin
+Bermuda|Bermuda
+Bhutan|Bhutan
+Bolivia|Bolivia
+Bosnia and Herzegovina|Bosnia and Herzegovina
+Botswana|Botswana
+Brazil|Brazil
+British Virgin Islands|British Virgin Islands
+Brunei|Brunei
+Bulgaria|Bulgaria
+Burkina Faso|Burkina Faso
+Burma|Burma
+Burundi|Burundi
+Cambodia|Cambodia
+Cameroon|Cameroon
+Canada|Canada
+Cape Verde|Cape Verde
+Cayman Islands|Cayman Islands
+Central African Republic|Central African Republic
+Chad|Chad
+Channel Islands|Channel Islands
+Chile|Chile
+China|China
+Colombia|Colombia
+Comoros|Comoros
+Congo, Democratic Republic of the|Congo, Democratic Republic of the
+Congo, Republic of the|Congo, Republic of the
+Cook Islands|Cook Islands
+Costa Rica|Costa Rica
+Cote d\'Ivoire|Cote d\'Ivoire
+Croatia|Croatia
+Cuba|Cuba
+Cyprus|Cyprus
+Czech Republic|Czech Republic
+Denmark|Denmark
+Djibouti|Djibouti
+Dominica|Dominica
+Dominican Republic|Dominican Republic
+East Timor|East Timor
+Ecuador|Ecuador
+Egypt|Egypt
+El Salvador|El Salvador
+Equatorial Guinea|Equatorial Guinea
+Eritrea|Eritrea
+Estonia|Estonia
+Ethiopia|Ethiopia
+Falkland Islands|Falkland Islands
+Faroe Islands|Faroe Islands
+Fiji|Fiji
+Finland|Finland
+France|France
+French Guiana|French Guiana
+French Polynesia|French Polynesia
+Gabon|Gabon
+Gambia, The|Gambia, The
+Gaza Strip|Gaza Strip
+Georgia|Georgia
+Germany|Germany
+Ghana|Ghana
+Gibraltar|Gibraltar
+Greece|Greece
+Greenland|Greenland
+Grenada|Grenada
+Guadeloupe|Guadeloupe
+Guam|Guam
+Guatemala|Guatemala
+Guinea|Guinea
+Guinea-Bissau|Guinea-Bissau
+Guyana|Guyana
+Haiti|Haiti
+Holy See (Vatican City)|Holy See (Vatican City)
+Honduras|Honduras
+Hong Kong|Hong Kong
+Hungary|Hungary
+Iceland|Iceland
+India|India
+Indonesia|Indonesia
+Iran|Iran
+Iraq|Iraq
+Ireland|Ireland
+Isle of Man|Isle of Man
+Israel|Israel
+Italy|Italy
+Jamaica|Jamaica
+Japan|Japan
+Jordan|Jordan
+Kazakhstan|Kazakhstan
+Korea, North|Korea, North
+Korea, South|Korea, South
+Kenya|Kenya
+Kiribati|Kiribati
+Kuwait|Kuwait
+Kyrgyzstan|Kyrgyzstan
+Laos|Laos
+Latvia|Latvia
+Lebanon|Lebanon
+Lesotho|Lesotho
+Liberia|Liberia
+Libya|Libya
+Liechtenstein|Liechtenstein
+Lithuania|Lithuania
+Luxembourg|Luxembourg
+Macau|Macau
+Macedonia|Macedonia
+Madagascar|Madagascar
+Malawi|Malawi
+Malaysia|Malaysia
+Maldives|Maldives
+Mali|Mali
+Malta|Malta
+Marshall Islands|Marshall Islands
+Martinique|Martinique
+Mauritania|Mauritania
+Mauritius|Mauritius
+Mexico|Mexico
+Micronesia|Micronesia
+Moldova|Moldova
+Monaco|Monaco
+Mongolia|Mongolia
+Montenegro|Montenegro
+Montserrat|Montserrat
+Morocco|Morocco
+Mozambique|Mozambique
+Namibia|Namibia
+Nauru|Nauru
+Nepal|Nepal
+Netherlands|Netherlands
+Netherlands Antilles|Netherlands Antilles
+New Caledonia|New Caledonia
+New Zealand|New Zealand
+Nicaragua|Nicaragua
+Niger|Niger
+Nigeria|Nigeria
+Niue|Niue
+Northern Mariana Islands|Northern Mariana Islands
+Norway|Norway
+Oman|Oman
+Pakistan|Pakistan
+Palau|Palau
+Panama|Panama
+Papua New Guinea|Papua New Guinea
+Paraguay|Paraguay
+Peru|Peru
+Philippines|Philippines
+Pitcairn Islands|Pitcairn Islands
+Poland|Poland
+Portugal|Portugal
+Puerto Rico|Puerto Rico
+Qatar|Qatar
+Reunion|Reunion
+Romania|Romania
+Russia|Russia
+Rwanda|Rwanda
+Saint Kitts and Nevis|Saint Kitts and Nevis
+Saint Lucia|Saint Lucia
+Saint Pierre and Miquelon|Saint Pierre and Miquelon
+Saint Vincent and the Grenadines|Saint Vincent and the Grenadines
+Samoa|Samoa
+San Marino|San Marino
+Sao Tome and Principe|Sao Tome and Principe
+Saudi Arabia|Saudi Arabia
+Senegal|Senegal
+Serbia|Serbia
+Seychelles|Seychelles
+Sierra Leone|Sierra Leone
+Singapore|Singapore
+Slovakia|Slovakia
+Slovenia|Slovenia
+Solomon Islands|Solomon Islands
+Somalia|Somalia
+South Africa|South Africa
+Spain|Spain
+Sri Lanka|Sri Lanka
+Sudan|Sudan
+Suriname|Suriname
+Swaziland|Swaziland
+Sweden|Sweden
+Switzerland|Switzerland
+Syria|Syria
+Taiwan|Taiwan
+Tajikistan|Tajikistan
+Tanzania|Tanzania
+Thailand|Thailand
+Togo|Togo
+Tokelau|Tokelau
+Tonga|Tonga
+Trinidad and Tobago|Trinidad and Tobago
+Tunisia|Tunisia
+Turkey|Turkey
+Turkmenistan|Turkmenistan
+Turks and Caicos Islands|Turks and Caicos Islands
+Tuvalu|Tuvalu
+Uganda|Uganda
+Ukraine|Ukraine
+United Arab Emirates|United Arab Emirates
+United Kingdom|United Kingdom
+United States|United States
+Uruguay|Uruguay
+Uzbekistan|Uzbekistan
+Vanuatu|Vanuatu
+Venezuela|Venezuela
+Vietnam|Vietnam
+Virgin Islands|Virgin Islands
+Wallis and Futuna|Wallis and Futuna
+West Bank|West Bank
+Western Sahara|Western Sahara
+Yemen|Yemen
+Zambia|Zambia
 Zimbabwe|Zimbabwe',
     'allowed_values_php' => 'return boinccore_get_country_list();',
     'widget' => array(
@@ -492,10 +492,10 @@ Zimbabwe|Zimbabwe',
       'default_value_php' => NULL,
       'label' => 'Your opinions about this project',
       'weight' => '4',
-      'description' => 'Tell us your thoughts about Einstein@Home
-
-   1. Why do you run Einstein@Home?
-   2. What are your views about the project?
+      'description' => 'Tell us your thoughts about Einstein@Home
+
+   1. Why do you run Einstein@Home?
+   2. What are your views about the project?
    3. Any suggestions? ',
       'type' => 'text_textarea',
       'module' => 'text',
diff --git a/drupal/sites/all/features/work_and_host_stats/work_and_host_stats.views_default.inc b/drupal/sites/all/features/work_and_host_stats/work_and_host_stats.views_default.inc
index 4082bd591b..c38ebceda8 100644
--- a/drupal/sites/all/features/work_and_host_stats/work_and_host_stats.views_default.inc
+++ b/drupal/sites/all/features/work_and_host_stats/work_and_host_stats.views_default.inc
@@ -288,9 +288,9 @@ function work_and_host_stats_views_default_views() {
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'value' => '<?php
-  require_boinc(\'util\');
-  echo time_str($data->result_sent_time);
+      'value' => '<?php
+  require_boinc(\'util\');
+  echo time_str($data->result_sent_time);
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_3',
@@ -532,15 +532,15 @@ function work_and_host_stats_views_default_views() {
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'value' => '<?php
-  require_boinc(\'result\');
-  $result = new stdClass();
-  $result->server_state = $data->result_server_state;
-  $result->outcome = $data->result_outcome;
-  $result->validate_state = $data->result_validate_state;
-  $result->client_state = $data->result_client_state;
-  $result->exit_status = $data->result_exit_status;
-  return state_string($result);
+      'value' => '<?php
+  require_boinc(\'result\');
+  $result = new stdClass();
+  $result->server_state = $data->result_server_state;
+  $result->outcome = $data->result_outcome;
+  $result->validate_state = $data->result_validate_state;
+  $result->client_state = $data->result_client_state;
+  $result->exit_status = $data->result_exit_status;
+  return state_string($result);
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_1',
@@ -1768,13 +1768,13 @@ function work_and_host_stats_views_default_views() {
       'empty' => '',
       'hide_empty' => 1,
       'empty_zero' => 0,
-      'value' => '<?php
-  if (is_current_boinc_user($data->host_userid)) {
-    $showIP = arg(2);
-    if ($showIP) {
-      echo $data->host_external_ip_addr;
-    }
-  }
+      'value' => '<?php
+  if (is_current_boinc_user($data->host_userid)) {
+    $showIP = arg(2);
+    if ($showIP) {
+      echo $data->host_external_ip_addr;
+    }
+  }
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_28',
@@ -1834,10 +1834,10 @@ function work_and_host_stats_views_default_views() {
       'empty' => '',
       'hide_empty' => 1,
       'empty_zero' => 0,
-      'value' => '<?php
-  if (is_current_boinc_user($data->host_userid)) {
-    echo $data->host_domain_name;
-  }
+      'value' => '<?php
+  if (is_current_boinc_user($data->host_userid)) {
+    echo $data->host_domain_name;
+  }
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_3',
@@ -1940,10 +1940,10 @@ function work_and_host_stats_views_default_views() {
       'empty' => '',
       'hide_empty' => 1,
       'empty_zero' => 0,
-      'value' => '<?php
-  if (is_current_boinc_user($data->host_userid)) {
-    echo $data->host_domain_name;
-  }
+      'value' => '<?php
+  if (is_current_boinc_user($data->host_userid)) {
+    echo $data->host_domain_name;
+  }
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_5',
@@ -2157,22 +2157,22 @@ function work_and_host_stats_views_default_views() {
       'empty' => '',
       'hide_empty' => 1,
       'empty_zero' => 0,
-      'value' => '<?php
-  require_boinc(\'util\');
-  $owner = BoincUser::lookup_id($data->host_userid);
-  if ($owner->show_hosts) {
-    require_boinc(\'stats_sites\');
-    global $host_sites;
-    $x = "";
-    foreach ($host_sites as $h) {
-      $url = $h[0];
-      $name = $h[1];
-      $img = $h[2];
-      $site_img = theme_image("sites/all/themes/einstein/shared/{$img}", $name, $name);
-      $x .= l($site_img, $url . $data->host_host_cpid, array(\'html\' => TRUE));
-    }
-    echo $x;
-  }
+      'value' => '<?php
+  require_boinc(\'util\');
+  $owner = BoincUser::lookup_id($data->host_userid);
+  if ($owner->show_hosts) {
+    require_boinc(\'stats_sites\');
+    global $host_sites;
+    $x = "";
+    foreach ($host_sites as $h) {
+      $url = $h[0];
+      $name = $h[1];
+      $img = $h[2];
+      $site_img = theme_image("sites/all/themes/einstein/shared/{$img}", $name, $name);
+      $x .= l($site_img, $url . $data->host_host_cpid, array(\'html\' => TRUE));
+    }
+    echo $x;
+  }
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_7',
@@ -2322,11 +2322,11 @@ function work_and_host_stats_views_default_views() {
       'empty' => '',
       'hide_empty' => 1,
       'empty_zero' => 0,
-      'value' => '<?php
-  if ($data->host_serialnum) {
-    require_boinc(\'host\');
-    echo gpu_desc($data->host_serialnum);
-  }
+      'value' => '<?php
+  if ($data->host_serialnum) {
+    require_boinc(\'host\');
+    echo gpu_desc($data->host_serialnum);
+  }
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_1',
@@ -2418,10 +2418,10 @@ function work_and_host_stats_views_default_views() {
       'empty' => '',
       'hide_empty' => 1,
       'empty_zero' => 0,
-      'value' => '<?php
-  require_boinc(\'host\');
-  $version = boinc_version($data->host_serialnum);
-  if ($version) echo $version;
+      'value' => '<?php
+  require_boinc(\'host\');
+  $version = boinc_version($data->host_serialnum);
+  if ($version) echo $version;
 ?>',
       'exclude' => 0,
       'id' => 'phpcode',
@@ -2522,8 +2522,8 @@ function work_and_host_stats_views_default_views() {
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'value' => '<?php
-  echo round($data->host_m_nbytes/(1024*1024), 2) . \' MiB\';
+      'value' => '<?php
+  echo round($data->host_m_nbytes/(1024*1024), 2) . \' MiB\';
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_8',
@@ -2554,8 +2554,8 @@ function work_and_host_stats_views_default_views() {
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'value' => '<?php
-  echo round($data->host_m_cache/(1024), 2) . \' KiB\';
+      'value' => '<?php
+  echo round($data->host_m_cache/(1024), 2) . \' KiB\';
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_9',
@@ -2691,10 +2691,10 @@ function work_and_host_stats_views_default_views() {
       'empty' => '',
       'hide_empty' => 1,
       'empty_zero' => 0,
-      'value' => '<?php
-  if (is_current_boinc_user($data->host_userid)) {
-    echo round($data->host_m_swap/(1024*1024), 2) . \' MiB\';
-  }
+      'value' => '<?php
+  if (is_current_boinc_user($data->host_userid)) {
+    echo round($data->host_m_swap/(1024*1024), 2) . \' MiB\';
+  }
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_10',
@@ -2725,10 +2725,10 @@ function work_and_host_stats_views_default_views() {
       'empty' => '',
       'hide_empty' => 1,
       'empty_zero' => 0,
-      'value' => '<?php
-  if (is_current_boinc_user($data->host_userid)) {
-    echo round($data->host_d_total/(1024*1024*1024), 2) . \' GiB\';
-  }
+      'value' => '<?php
+  if (is_current_boinc_user($data->host_userid)) {
+    echo round($data->host_d_total/(1024*1024*1024), 2) . \' GiB\';
+  }
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_11',
@@ -2759,10 +2759,10 @@ function work_and_host_stats_views_default_views() {
       'empty' => '',
       'hide_empty' => 1,
       'empty_zero' => 0,
-      'value' => '<?php
-  if (is_current_boinc_user($data->host_userid)) {
-    echo round($data->host_d_free/(1024*1024*1024), 2) . \' GiB\';
-  }
+      'value' => '<?php
+  if (is_current_boinc_user($data->host_userid)) {
+    echo round($data->host_d_free/(1024*1024*1024), 2) . \' GiB\';
+  }
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_12',
@@ -3580,10 +3580,10 @@ function work_and_host_stats_views_default_views() {
       'empty' => '',
       'hide_empty' => 1,
       'empty_zero' => 0,
-      'value' => '<?php
-  if (is_current_boinc_user($data->host_userid)) {
-    echo ($data->host_on_frac * 100) . \' %\';
-  }
+      'value' => '<?php
+  if (is_current_boinc_user($data->host_userid)) {
+    echo ($data->host_on_frac * 100) . \' %\';
+  }
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_20',
@@ -3614,12 +3614,12 @@ function work_and_host_stats_views_default_views() {
       'empty' => '',
       'hide_empty' => 1,
       'empty_zero' => 0,
-      'value' => '<?php
-  if (is_current_boinc_user($data->host_userid)) {
-    if ($data->host_connected_frac > 0) {
-      echo ($data->host_connected_frac * 100) . \' %\';
-    }
-  }
+      'value' => '<?php
+  if (is_current_boinc_user($data->host_userid)) {
+    if ($data->host_connected_frac > 0) {
+      echo ($data->host_connected_frac * 100) . \' %\';
+    }
+  }
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_21',
@@ -3650,10 +3650,10 @@ function work_and_host_stats_views_default_views() {
       'empty' => '',
       'hide_empty' => 1,
       'empty_zero' => 0,
-      'value' => '<?php
-  if (is_current_boinc_user($data->host_userid)) {
-    echo $data->host_active_frac;
-  }
+      'value' => '<?php
+  if (is_current_boinc_user($data->host_userid)) {
+    echo $data->host_active_frac;
+  }
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_22',
@@ -3684,12 +3684,12 @@ function work_and_host_stats_views_default_views() {
       'empty' => '',
       'hide_empty' => 1,
       'empty_zero' => 0,
-      'value' => '<?php
-  if (is_current_boinc_user($data->host_userid)) {
-    if ($data->host_cpu_efficiency) {
-      echo $data->host_cpu_efficiency;
-    }
-  }
+      'value' => '<?php
+  if (is_current_boinc_user($data->host_userid)) {
+    if ($data->host_cpu_efficiency) {
+      echo $data->host_cpu_efficiency;
+    }
+  }
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_27',
@@ -3720,12 +3720,12 @@ function work_and_host_stats_views_default_views() {
       'empty' => '',
       'hide_empty' => 1,
       'empty_zero' => 0,
-      'value' => '<?php
-  if (is_current_boinc_user($data->host_userid)) {
-    if ($data->host_duration_correction_factor) {
-      echo $data->host_duration_correction_factor;
-    }
-  }
+      'value' => '<?php
+  if (is_current_boinc_user($data->host_userid)) {
+    if ($data->host_duration_correction_factor) {
+      echo $data->host_duration_correction_factor;
+    }
+  }
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_23',
@@ -4889,9 +4889,9 @@ function work_and_host_stats_views_default_views() {
       'label' => 'Computer ID',
       'alter' => array(
         'alter_text' => 0,
-        'text' => 'ID: [id]
-<a href="">Details</a> | <a href="">Tasks</a>
-Cross-project stats:
+        'text' => 'ID: [id]
+<a href="">Details</a> | <a href="">Tasks</a>
+Cross-project stats:
 ...',
         'make_link' => 0,
         'path' => '',
@@ -5010,18 +5010,18 @@ Cross-project stats:
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'value' => '<?php
-  require_boinc(\'stats_sites\');
-  global $host_sites;
-  $x = "";
-  foreach ($host_sites as $h) {
-    $url = $h[0];
-    $name = $h[1];
-    $img = $h[2];
-    $site_img = theme_image("sites/all/themes/einstein/shared/{$img}", $name, $name);
-    $x .= l($site_img, $url . $data->host_host_cpid, array(\'html\' => TRUE));
-  }
-  echo "Cross-project stats: {$x}";
+      'value' => '<?php
+  require_boinc(\'stats_sites\');
+  global $host_sites;
+  $x = "";
+  foreach ($host_sites as $h) {
+    $url = $h[0];
+    $name = $h[1];
+    $img = $h[2];
+    $site_img = theme_image("sites/all/themes/einstein/shared/{$img}", $name, $name);
+    $x .= l($site_img, $url . $data->host_host_cpid, array(\'html\' => TRUE));
+  }
+  echo "Cross-project stats: {$x}";
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_4',
@@ -5180,9 +5180,9 @@ Cross-project stats:
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'value' => '<?php
-  require_boinc(\'host\');
-  echo boinc_version($data->host_serialnum);
+      'value' => '<?php
+  require_boinc(\'host\');
+  echo boinc_version($data->host_serialnum);
 ?>',
       'exclude' => 0,
       'id' => 'phpcode',
@@ -5303,9 +5303,9 @@ Cross-project stats:
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'value' => '<?php
-  require_boinc(\'host\');
-  echo gpu_desc($data->host_serialnum);
+      'value' => '<?php
+  require_boinc(\'host\');
+  echo gpu_desc($data->host_serialnum);
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_1',
@@ -5808,9 +5808,9 @@ Cross-project stats:
       'label' => 'Computer ID',
       'alter' => array(
         'alter_text' => 0,
-        'text' => 'ID: [id]
-<a href="">Details</a> | <a href="">Tasks</a>
-Cross-project stats:
+        'text' => 'ID: [id]
+<a href="">Details</a> | <a href="">Tasks</a>
+Cross-project stats:
 ...',
         'make_link' => 0,
         'path' => '',
@@ -5935,18 +5935,18 @@ Cross-project stats:
       'hide_empty' => 0,
       'empty_zero' => 0,
       'hide_alter_empty' => 1,
-      'value' => '<?php
-  require_boinc(\'stats_sites\');
-  global $host_sites;
-  $x = "";
-  foreach ($host_sites as $h) {
-    $url = $h[0];
-    $name = $h[1];
-    $img = $h[2];
-    $site_img = theme_image("sites/default/themes/project/einstein/shared/{$img}", $name, $name);
-    $x .= l($site_img, $url . $data->host_host_cpid, array(\'html\' => TRUE));
-  }
-  echo "Cross-project stats: {$x}";
+      'value' => '<?php
+  require_boinc(\'stats_sites\');
+  global $host_sites;
+  $x = "";
+  foreach ($host_sites as $h) {
+    $url = $h[0];
+    $name = $h[1];
+    $img = $h[2];
+    $site_img = theme_image("sites/default/themes/project/einstein/shared/{$img}", $name, $name);
+    $x .= l($site_img, $url . $data->host_host_cpid, array(\'html\' => TRUE));
+  }
+  echo "Cross-project stats: {$x}";
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_4',
@@ -6151,9 +6151,9 @@ else {
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'value' => '<?php
-  require_boinc(\'host\');
-  echo boinc_version($data->host_serialnum);
+      'value' => '<?php
+  require_boinc(\'host\');
+  echo boinc_version($data->host_serialnum);
 ?>',
       'exclude' => 0,
       'id' => 'phpcode',
@@ -6274,9 +6274,9 @@ else {
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'value' => '<?php
-  require_boinc(\'host\');
-  echo gpu_desc($data->host_serialnum);
+      'value' => '<?php
+  require_boinc(\'host\');
+  echo gpu_desc($data->host_serialnum);
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_1',
@@ -7549,9 +7549,9 @@ else {
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'value' => '<?php
-  require_boinc(\'util\');
-  echo time_str($data->result_sent_time);
+      'value' => '<?php
+  require_boinc(\'util\');
+  echo time_str($data->result_sent_time);
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_3',
@@ -7793,15 +7793,15 @@ else {
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'value' => '<?php
-  require_boinc(\'result\');
-  $result = new stdClass();
-  $result->server_state = $data->result_server_state;
-  $result->outcome = $data->result_outcome;
-  $result->validate_state = $data->result_validate_state;
-  $result->client_state = $data->result_client_state;
-  $result->exit_status = $data->result_exit_status;
-  return state_string($result);
+      'value' => '<?php
+  require_boinc(\'result\');
+  $result = new stdClass();
+  $result->server_state = $data->result_server_state;
+  $result->outcome = $data->result_outcome;
+  $result->validate_state = $data->result_validate_state;
+  $result->client_state = $data->result_client_state;
+  $result->exit_status = $data->result_exit_status;
+  return state_string($result);
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_1',
@@ -10770,10 +10770,10 @@ else {
       'empty' => '',
       'hide_empty' => 1,
       'empty_zero' => 0,
-      'value' => '<?php
-  if ($data->workunit_canonical_resultid) {
-    echo l($data->workunit_canonical_resultid, "task/{$data->workunit_canonical_resultid}");
-  }
+      'value' => '<?php
+  if ($data->workunit_canonical_resultid) {
+    echo l($data->workunit_canonical_resultid, "task/{$data->workunit_canonical_resultid}");
+  }
 ?>',
       'exclude' => 0,
       'id' => 'phpcode',
@@ -10804,10 +10804,10 @@ else {
       'empty' => '',
       'hide_empty' => 1,
       'empty_zero' => 0,
-      'value' => '<?php
-  if ($data->workunit_canonical_resultid) {
-    echo $data->workunit_canonical_credit;
-  }
+      'value' => '<?php
+  if ($data->workunit_canonical_resultid) {
+    echo $data->workunit_canonical_credit;
+  }
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_1',
@@ -11083,10 +11083,10 @@ else {
       'empty' => '',
       'hide_empty' => 1,
       'empty_zero' => 0,
-      'value' => '<?php
-  if ($data->app_target_nresults>0 AND !$data->workunit_canonical_resultid) {
-    echo \'suppressed pending completion\';
-  }
+      'value' => '<?php
+  if ($data->app_target_nresults>0 AND !$data->workunit_canonical_resultid) {
+    echo \'suppressed pending completion\';
+  }
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_2',
@@ -11117,10 +11117,10 @@ else {
       'empty' => '',
       'hide_empty' => 1,
       'empty_zero' => 0,
-      'value' => '<?php
-  if ($data->app_target_nresults <= 0 OR $data->workunit_canonical_resultid) {
-    echo $data->workunit_min_quorum;
-  }
+      'value' => '<?php
+  if ($data->app_target_nresults <= 0 OR $data->workunit_canonical_resultid) {
+    echo $data->workunit_min_quorum;
+  }
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_3',
@@ -11151,10 +11151,10 @@ else {
       'empty' => '',
       'hide_empty' => 1,
       'empty_zero' => 0,
-      'value' => '<?php
-  if ($data->app_target_nresults <= 0 OR $data->workunit_canonical_resultid) {
-    echo $data->workunit_target_nresults;
-  }
+      'value' => '<?php
+  if ($data->app_target_nresults <= 0 OR $data->workunit_canonical_resultid) {
+    echo $data->workunit_target_nresults;
+  }
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_4',
@@ -11185,10 +11185,10 @@ else {
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'value' => '<?php
-  if ($data->app_target_nresults <= 0 OR $data->workunit_canonical_resultid) {
-    echo "{$data->workunit_max_error_results}, {$data->workunit_max_total_results}, {$data->workunit_max_success_results}";
-  }
+      'value' => '<?php
+  if ($data->app_target_nresults <= 0 OR $data->workunit_canonical_resultid) {
+    echo "{$data->workunit_max_error_results}, {$data->workunit_max_total_results}, {$data->workunit_max_success_results}";
+  }
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_5',
@@ -11219,13 +11219,13 @@ else {
       'empty' => '',
       'hide_empty' => 1,
       'empty_zero' => 0,
-      'value' => '<?php
-  if ($data->app_target_nresults <= 0 OR $data->workunit_canonical_resultid) {
-    if ($data->workunit_error_mask) {
-      require_boinc(\'result\');
-      echo wu_error_mask_str($data->workunit_error_mask);
-    }
-  }
+      'value' => '<?php
+  if ($data->app_target_nresults <= 0 OR $data->workunit_canonical_resultid) {
+    if ($data->workunit_error_mask) {
+      require_boinc(\'result\');
+      echo wu_error_mask_str($data->workunit_error_mask);
+    }
+  }
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_6',
@@ -11622,9 +11622,9 @@ else {
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'value' => '<?php
-  require_boinc(\'util\');
-  echo time_str($data->result_sent_time);
+      'value' => '<?php
+  require_boinc(\'util\');
+  echo time_str($data->result_sent_time);
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_3',
@@ -11866,15 +11866,15 @@ else {
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'value' => '<?php
-  require_boinc(\'result\');
-  $result = new stdClass();
-  $result->server_state = $data->result_server_state;
-  $result->outcome = $data->result_outcome;
-  $result->validate_state = $data->result_validate_state;
-  $result->client_state = $data->result_client_state;
-  $result->exit_status = $data->result_exit_status;
-  return state_string($result);
+      'value' => '<?php
+  require_boinc(\'result\');
+  $result = new stdClass();
+  $result->server_state = $data->result_server_state;
+  $result->outcome = $data->result_outcome;
+  $result->validate_state = $data->result_validate_state;
+  $result->client_state = $data->result_client_state;
+  $result->exit_status = $data->result_exit_status;
+  return state_string($result);
 ?>',
       'exclude' => 0,
       'id' => 'phpcode_1',