diff --git a/site/app_controller.php b/site/app_controller.php
index 587c9a9..7b39f5e 100644
--- a/site/app_controller.php
+++ b/site/app_controller.php
@@ -293,14 +293,12 @@ class AppController extends Controller {
 
   function jqGridRecordLinks(&$params, &$model, &$records, $links) {
     foreach ($links AS $table => $fields) {
+      $special = array('controller', 'id');
       $controller = Inflector::pluralize(Inflector::underscore($table));
       $id = 'id';
-      if (isset($fields['controller']))
-	$controller = $fields['controller'];
-      if (isset($fields['id']))
-	$id = $fields['id'];
+      extract(array_intersect_key($fields, array_flip($special)));
       foreach ($records AS &$record) {
-	foreach (array_diff_key($fields, array('id'=>1)) AS $field) {
+	foreach (array_diff_key($fields, array_flip($special)) AS $field) {
 	  // DEBUG PURPOSES ONLY!
 	  //$params['linkrecord'][] = compact('table', 'field', 'id', 'controller', 'record');
 	  $record[$table][$field] =