diff --git a/config/vufind/EDS.ini b/config/vufind/EDS.ini
index 27393fd7cd81a687c64209d6c7f7c860d5f25cb3..45b71bc39353c7b4af17fcc82b39191b6cd97927 100644
--- a/config/vufind/EDS.ini
+++ b/config/vufind/EDS.ini
@@ -199,6 +199,7 @@ translated_facets[] = SourceType
 AllFields           = "All Fields"
 TI                  = Title
 AU                  = Author
+SU                  = Subject
 
 ; This section defines which search options will be included on the advanced
 ; search screen.  All the notes above [Basic_Searches] also apply here.
diff --git a/module/VuFind/src/VuFind/RecordDriver/EDS.php b/module/VuFind/src/VuFind/RecordDriver/EDS.php
index a853117e790c5c94addf9c0d07c7dd9b29b068e2..5c70247ba5676916310c0ccfa37253c1d3b63424 100644
--- a/module/VuFind/src/VuFind/RecordDriver/EDS.php
+++ b/module/VuFind/src/VuFind/RecordDriver/EDS.php
@@ -579,9 +579,9 @@ class EDS extends DefaultRecord
                 if (in_array($group, $allowed_searchlink_groups)) {
                     $type = strtoupper($group);
                     $link_xml = '/<searchLink fieldCode="([^\"]*)" '
-                        . 'term="%22([^\"]*)%22">/';
-                    $link_html
-                        = "<a href=\"../EDS/Search?lookfor=$2&amp;type={$type}\">";
+                        . 'term="(%22[^\"]*%22)">/';
+                    $link_html = '<a href="../EDS/Search?lookfor=$2&amp;type='
+                        . urlencode($type) . '">';
                     $data = preg_replace($link_xml, $link_html, $data);
                     $data = str_replace('</searchLink>', '</a>', $data);
                 }