diff --git a/admin/dropdown-bpgroup.php b/admin/dropdown-bpgroup.php
new file mode 100644
index 00000000..dac483f6
--- /dev/null
+++ b/admin/dropdown-bpgroup.php
@@ -0,0 +1,38 @@
+<?php
+
+class P2P_Dropdown_Bpgroup extends P2P_Dropdown {
+
+	function __construct( $directed, $title ) {
+		parent::__construct( $directed, $title );
+
+		add_action( 'pre_bpgroup_query', array( __CLASS__, 'massage_query' ), 9 );
+
+		add_action( 'restrict_manage_bpgroup', array( $this, 'show_dropdown' ) );
+	}
+
+	static function massage_query( $query ) {
+		if ( isset( $query->_p2p_capture ) )
+			return;
+
+		// Don't overwrite existing P2P query
+		if ( isset( $query->query_vars['connected_type'] ) )
+			return;
+
+		_p2p_append( $query->query_vars, self::get_qv() );
+	}
+
+	protected function render_dropdown() {
+		return html( 'div', array(
+			'style' => 'float: right; margin-left: 16px'
+		),
+			parent::render_dropdown(),
+			html( 'input', array(
+				'type' => 'submit',
+				'class' => 'button',
+				'value' => __( 'Filter', P2P_TEXTDOMAIN )
+			) )
+		);
+	}
+}
+
+
diff --git a/admin/field-title-bpgroup.php b/admin/field-title-bpgroup.php
new file mode 100644
index 00000000..2438a005
--- /dev/null
+++ b/admin/field-title-bpgroup.php
@@ -0,0 +1,15 @@
+<?php
+
+class P2P_Field_Title_Bpgroup extends P2P_Field_Title {
+
+	function get_data( $item ) {
+		$data = array(
+			'title-attr' => $item->get_permalink()
+		);
+
+		$data['status']['text'] = __(ucwords($item->status),P2P_TEXTDOMAIN);
+
+		return $data;
+	}
+}
+
diff --git a/composer.json b/composer.json
index 5e865dcd..5d6ce646 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
     "repositories": [
         {
             "type": "vcs",
-            "url": "https://github.com/scribu/wp-lib-posts-to-posts"
+            "url": "https://github.com/clariner/wp-lib-posts-to-posts"
         }
     ]
 }
diff --git a/composer.lock b/composer.lock
index 58e640d2..e78bf6f6 100644
--- a/composer.lock
+++ b/composer.lock
@@ -146,8 +146,8 @@
             "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "https://github.com/scribu/wp-lib-posts-to-posts.git",
-                "reference": "f6bafd5c4d93af0197f5690574cfe3c073b2f938"
+                "url": "https://github.com/clariner/wp-lib-posts-to-posts.git",
+                "reference": "490aa6785e67cc360dd95f4d2b20843de56302bb"
             },
             "dist": {
                 "type": "zip",