diff --git a/code/UserFormsGridFieldFilterHeader.php b/code/UserFormsGridFieldFilterHeader.php
index 28a3c4b..3eefb83 100644
--- a/code/UserFormsGridFieldFilterHeader.php
+++ b/code/UserFormsGridFieldFilterHeader.php
@@ -34,14 +34,14 @@ class UserFormsGridFieldFilterHeader extends GridFieldFilterHeader {
 
 		// retrieve a list of all the available form fields that have been 
 		// submitted in this form.
+		$params = $gridField->getForm()->getController()->getURLParams();
+
 		$formFields = SubmittedFormField::get()
-			->filter(array(
-				"SubmittedForm.ParentID" => $gridField->getList()->column()
-			))
+			->where(sprintf("SubmittedForm.ParentID = '%s'", Convert::raw2sql($params['ID'])))
 			->leftJoin('SubmittedForm', 'SubmittedFormField.ParentID = SubmittedForm.ID')
 			->sort('Title', 'ASC')
 			->map('Name', 'Title');
-		
+
 		// show dropdown of all the fields available from the submitted form fields
 		// that have been saved. Takes the titles from the currently live form.
 		$columnField = new DropdownField(
diff --git a/code/model/UserDefinedForm.php b/code/model/UserDefinedForm.php
index ad38d84..d952719 100755
--- a/code/model/UserDefinedForm.php
+++ b/code/model/UserDefinedForm.php
@@ -118,9 +118,7 @@ class UserDefinedForm extends Page {
 
 		// attach every column to the print view from 
 		$columns = SubmittedFormField::get()
-			->filter(array(
-				"SubmittedForm.ParentID" => $this->ID
-			))
+			->where("SubmittedForm.ParentID = '$this->ID'")
 			->leftJoin('SubmittedForm', 'SubmittedFormField.ParentID = SubmittedForm.ID')
 			->map('Name', 'Title');
 
diff --git a/composer.json b/composer.json
index 3ce9cb4..1578b78 100644
--- a/composer.json
+++ b/composer.json
@@ -9,6 +9,6 @@
 		"email": "will@fullscreen.io"
 	}],
 	"require": {
-		"silverstripe/framework": ">=3.1.*@dev"
+		"silverstripe/framework": "3.*"
 	}
 }
\ No newline at end of file