diff --git a/code/Calendar.php b/code/Calendar.php
index 50a0f93..5ea1cef 100755
--- a/code/Calendar.php
+++ b/code/Calendar.php
@@ -115,12 +115,12 @@ public function getCMSFields()
 				GridFieldConfig_RecordEditor::create()				
 			));
 
-		$otherCals = Calendar::get()->filter("ID:Negation",$this->ID);
+		$otherCals = Calendar::get()->exclude(array("ID" => $this->ID));
 		if($otherCals->exists()) {				
 			$f->addFieldToTab("Root.$feeds", new CheckboxSetField(
 				'NestedCalendars', 
 				_t('Calendar.NESTEDCALENDARS','Include events from these calendars'),
-				$otherCals->map()
+				$otherCals->map('ID', 'Link')
 			));
 		}