diff --git a/include/ajax.orgs.php b/include/ajax.orgs.php
index ccdd3597cd1ce52a0a84c1cef46471b23318077c..9c2a2b207c11ba72e8b6c7fa259670d0b4b6a0d7 100644
--- a/include/ajax.orgs.php
+++ b/include/ajax.orgs.php
@@ -32,7 +32,7 @@ class OrgsAjaxAPI extends AjaxController {
         $q = $_REQUEST['q'];
         $limit = isset($_REQUEST['limit']) ? (int) $_REQUEST['limit']:25;
 
-        if (strlen($q) < 3)
+        if (strlen(Format::searchable($q)) < 3)
             return $this->encode(array());
 
         $orgs = Organization::objects()
diff --git a/include/ajax.tickets.php b/include/ajax.tickets.php
index 3a157a511e6ba92c666e25738401ab4320db74f3..17799f2121a323170cf8d0f953567f039657db24 100644
--- a/include/ajax.tickets.php
+++ b/include/ajax.tickets.php
@@ -51,7 +51,7 @@ class TicketsAjaxAPI extends AjaxController {
 
         $q = $_REQUEST['q'];
 
-        if (strlen($q) < 3)
+        if (strlen(Format::searchable($q)) < 3)
             return $this->encode(array());
 
         global $ost;
diff --git a/include/ajax.users.php b/include/ajax.users.php
index 07fc02f7917db0501cd0b949face1bd3042ddfc2..c4e32cc9155e963911511ee081f9d3bd39712fcf 100644
--- a/include/ajax.users.php
+++ b/include/ajax.users.php
@@ -39,7 +39,7 @@ class UsersAjaxAPI extends AjaxController {
         $emails=array();
         $matches = array();
 
-        if (strlen($q) < 3)
+        if (strlen(Format::searchable($q)) < 3)
             return $this->encode(array());
 
         if (!$type || !strcasecmp($type, 'remote')) {
diff --git a/include/class.forms.php b/include/class.forms.php
index 954ea2581b0f5bbc5e92db32abd06f8e9e85102d..475795eb5d8da9403895a2ab7fe67e76d946563e 100644
--- a/include/class.forms.php
+++ b/include/class.forms.php
@@ -2297,7 +2297,7 @@ class PriorityField extends ChoiceField {
 }
 FormField::addFieldTypes(/*@trans*/ 'Dynamic Fields', function() {
     return array(
-        'priority' => array(__('Priority Level'), PriorityField),
+        'priority' => array(__('Priority Level'), 'PriorityField'),
     );
 });
 
@@ -2401,7 +2401,7 @@ class DepartmentField extends ChoiceField {
 }
 FormField::addFieldTypes(/*@trans*/ 'Dynamic Fields', function() {
     return array(
-        'department' => array(__('Department'), DepartmentField),
+        'department' => array(__('Department'), 'DepartmentField'),
     );
 });
 
@@ -2522,7 +2522,7 @@ class AssigneeField extends ChoiceField {
 }
 FormField::addFieldTypes(/*@trans*/ 'Dynamic Fields', function() {
     return array(
-        'assignee' => array(__('Assignee'), AssigneeField),
+        'assignee' => array(__('Assignee'), 'AssigneeField'),
     );
 });
 
@@ -2612,7 +2612,7 @@ class TicketStateField extends ChoiceField {
 }
 FormField::addFieldTypes('Dynamic Fields', function() {
     return array(
-        'state' => array('Ticket State', TicketStateField, false),
+        'state' => array('Ticket State', 'TicketStateField', false),
     );
 });
 
@@ -2671,7 +2671,7 @@ class TicketFlagField extends ChoiceField {
 
 FormField::addFieldTypes('Dynamic Fields', function() {
     return array(
-        'flags' => array('Ticket Flags', TicketFlagField, false),
+        'flags' => array('Ticket Flags', 'TicketFlagField', false),
     );
 });
 
diff --git a/include/class.list.php b/include/class.list.php
index 69106502be674220c0f2c36c2293932554245471..6f7fa3b0399720ba87ea8801599646818ef154f0 100644
--- a/include/class.list.php
+++ b/include/class.list.php
@@ -522,7 +522,7 @@ class DynamicList extends VerySimpleModel implements CustomList {
         foreach (DynamicList::objects() as $list) {
             $selections['list-'.$list->id] =
                 array($list->getPluralName(),
-                    SelectionField, $list->get('id'));
+                    'SelectionField', $list->get('id'));
         }
         return $selections;
     }
diff --git a/scp/js/scp.js b/scp/js/scp.js
index c825c051cc64764435c33debafd976b3c0c53324..6b68d970a6581b46fc2dcca8c954d9b68b8888c5 100644
--- a/scp/js/scp.js
+++ b/scp/js/scp.js
@@ -193,6 +193,8 @@ var scp_prep = function() {
         }
      });
 
+    $('form select#cannedResp').select2({width: '300px'});
+
     $('form select#cannedResp').change(function() {
 
         var fObj = $(this).closest('form');