diff --git domain/domain_views/includes/domain_views_handler_field_domain_sitename.inc domain/domain_views/includes/domain_views_handler_field_domain_sitename.inc
index da43cb0..40f96df 100644
--- domain/domain_views/includes/domain_views_handler_field_domain_sitename.inc
+++ domain/domain_views/includes/domain_views_handler_field_domain_sitename.inc
@@ -13,12 +13,12 @@
  * @ingroup domain_views
  */
 class domain_views_handler_field_domain_sitename extends views_handler_field {
-  /**
-   * Constructor to provide additional field to add.
-   */
-  function construct() {
-    parent::construct();
-    $this->additional_fields['domain_id'] = 'domain_id';
+  function init(&$view, $options) {
+    parent::init($view, $options);
+    if (!empty($this->options['link_to_original_domain'])) {
+      $this->additional_fields['scheme'] = 'scheme';
+      $this->additional_fields['subdomain'] = 'subdomain';
+    }
   }
 
   function option_definition() {
@@ -91,16 +91,26 @@ class domain_views_handler_field_domain_sitename extends views_handler_field {
     if (!empty($this->options['link_to_default_domain']) && $data !== NULL && $data !== '') {
       $this->options['alter']['make_link'] = TRUE;
       $domain = domain_lookup(0);
-      $node_path = drupal_get_path_alias('node/'. $values->{$this->aliases['nid']});
-      $this->options['alter']['path'] = $domain['scheme'] .'://'. $domain['subdomain'] .'/'. $node_path;
+      $path = $domain['scheme'] .'://'. $domain['subdomain'] .'/';
+      if (array_key_exists('nid', $values)) {
+        $path .=  drupal_get_path_alias('node/'. $values->nid);
+      }
+      $this->options['alter']['path'] = $path;
     }
     if (!empty($this->options['link_to_original_domain']) && $data !== NULL && $data !== '') {
+      $path = $values->{$this->aliases['scheme']} .'://'. $values->{$this->aliases['subdomain']} .'/';
+      
+      $scheme = empty($_SERVER['HTTPS']) ? 'http' : 'https';
+      $current = $scheme . '://' . $_SERVER['HTTP_HOST'] . '/';
+
+      $active_domain = ($current == $path) ? TRUE : FALSE;
+
+      if (array_key_exists('nid', $values)) {
+        $path .=  drupal_get_path_alias('node/'. $values->nid);
+      }
       $this->options['alter']['make_link'] = TRUE;
-      $domain_id = $values->{$this->aliases['domain_id']};
-      $domain = domain_lookup($domain_id);
-      $this->aliases['nid'] = 'nid';
-      $node_path = drupal_get_path_alias('node/'. $values->{$this->aliases['nid']});
-      $this->options['alter']['path'] = $domain['scheme'] .'://'. $domain['subdomain'] .'/'. $node_path;
+      $this->options['alter']['path'] = $path;
+      $this->options['alter']['link_class'] = $active_domain ? 'active-domain' : '';
     }
     return $data;
   }