diff -rupN apachesolr_views_org/apachesolr_views.views.inc apachesolr_views/apachesolr_views.views.inc
--- apachesolr_views_org/apachesolr_views.views.inc	2011-02-25 03:10:33.000000000 +0100
+++ apachesolr_views/apachesolr_views.views.inc	2011-03-15 09:34:40.351191994 +0100
@@ -16,6 +16,9 @@ function apachesolr_views_views_handlers
       'apachesolr_views_handler_argument_optionwidget' => array(
         'parent' => 'apachesolr_views_handler_argument',
       ),
+      'apachesolr_views_handler_argument_gid' => array(
+        'parent' => 'apachesolr_views_handler_argument',
+      ),
       'apachesolr_views_handler_argument_node_type' => array(
         'parent' => 'apachesolr_views_handler_argument',
       ),
@@ -116,9 +119,6 @@ function apachesolr_views_views_plugins(
         //'help topic' => 'apachesolr-cache-time', // TODO!!!
       ),
     ),
-    'argument' => array( 	 
-      'handler' => 'apachesolr_views_handler_argument_search', 	 
-    ),
   );
 
 }
@@ -138,7 +138,6 @@ function apachesolr_views_views_data() {
       'help' => t('Searches the site with the Apache Solr search engine for @name', array('@name' => $name)),
       'field' => $base_field,
     );
-
     $data['apachesolr_' . $base_table]['nid'] = array(
       'title' => t('Nid'),
       'help' => t('The node ID of the node.'),
@@ -215,6 +214,7 @@ function apachesolr_views_views_data() {
         'handler' => 'apachesolr_views_handler_sort',
       ),
     );
+  
     // TODO Get taxonomy fields to work
     if (module_exists('taxonomy')) {
       $data['apachesolr_' . $base_table]['tid'] = array(
@@ -237,6 +237,21 @@ function apachesolr_views_views_data() {
         ),
       );
     }
+    // Add OG field im_og_gid if OG installed
+    if (module_exists('apachesolr_og')) {
+      $data['apachesolr_' . $base_table]['im_og_gid'] = array(
+        'title' => t('Organic group IDs'),
+        'help' => t('The OG gids.'),
+        'argument' => array(
+          'handler' => 'apachesolr_views_handler_argument_gid',
+        ),
+        'field' => array(
+          'numeric' => TRUE,
+          'handler' => 'views_handler_field_numeric',
+          'click sortable' => FALSE,
+        ),
+      );
+    }
     // @TODO: handle language field.
   
     $data['apachesolr_' . $base_table]['text'] = array(
@@ -245,6 +260,9 @@ function apachesolr_views_views_data() {
       'filter' => array(
         'handler' => 'apachesolr_views_handler_filter_search',
       ),
+      'argument' => array(     
+        'handler' => 'apachesolr_views_handler_argument_search',     
+      ),
     );
   
     // score field. Useful for when combining sorts. So you sort by score, creation etc.
diff -rupN apachesolr_views_org/handlers/apachesolr_views_handler_argument_gid.inc apachesolr_views/handlers/apachesolr_views_handler_argument_gid.inc
--- apachesolr_views_org/handlers/apachesolr_views_handler_argument_gid.inc	1970-01-01 01:00:00.000000000 +0100
+++ apachesolr_views/handlers/apachesolr_views_handler_argument_gid.inc	2011-03-15 09:34:40.351191994 +0100
@@ -0,0 +1,19 @@
+<?php
+
+// $Id:
+
+/**
+ * Class that allows searching the site with Apache Solr through a view argument.
+ */
+class apachesolr_views_handler_argument_gid extends apachesolr_views_handler_argument {
+  
+  /**
+   * Add argument to query.
+   */
+  public function query() {
+    $this->value = explode(',', $this->argument);
+    $op = ($this->operator == 'and') ? ' AND ' : ' OR ';   
+    $filter = "(" . join($op, $this->value) . ")";
+    $this->query->add_filter($this->real_field, $filter, $this->options['not']);
+  }
+}
diff -rupN apachesolr_views_org/handlers/apachesolr_views_handler_argument.inc apachesolr_views/handlers/apachesolr_views_handler_argument.inc
--- apachesolr_views_org/handlers/apachesolr_views_handler_argument.inc	2011-02-25 03:10:33.000000000 +0100
+++ apachesolr_views/handlers/apachesolr_views_handler_argument.inc	2011-03-15 09:34:40.351191994 +0100
@@ -91,3 +91,4 @@ class apachesolr_views_handler_argument 
   }
   
 }
+