diff --git a/sites/all/modules/nodereference_url/nodereference_url.module b/sites/all/modules/nodereference_url/nodereference_url.module
index 2000fcc..12bc82f 100644
--- a/sites/all/modules/nodereference_url/nodereference_url.module
+++ b/sites/all/modules/nodereference_url/nodereference_url.module
@@ -41,6 +41,7 @@ function nodereference_url_field_widget_info() {
         'fallback' => 'select',
         'node_link' => array(),
         'edit_fallback' => 0,
+        'autocomplete_match' => 'contains',
       ),
     ),
   );
@@ -271,11 +272,27 @@ function nodereference_url_field_widget_settings_form($field, $instance) {
       '#element_validate' => array('nodereference_url_fallback_validate'),
       '#weight' => -11,
     );
+    $form['autocomplete_match'] = array(
+      '#type' => 'select',
+      '#title' => t('Autocomplete matching'),
+      '#default_value' => $settings['autocomplete_match'],
+      '#options' => array(
+        'starts_with' => t('Starts with'),
+        'contains' => t('Contains'),
+      ),
+      '#description' => t('Select the method used to collect autocomplete suggestions. <br /> Note that <em>Contains</em> can cause performance issues on sites with thousands of nodes.'),
+      '#states' => array(
+        'visible' => array(
+          ':input[name="instance[widget][settings][fallback]"]' => array('value' => 'autocomplete'),
+        ),
+      ),
+      '#weight' => -10,         
+    );
     $form['edit_fallback'] = array(
       '#type' => 'checkbox',
       '#title' => t('Use fallback behavior when editing content'),
       '#default_value' => isset($settings['edit_fallback']) ? $settings['edit_fallback'] : FALSE,
-      '#weight' => -10,
+      '#weight' => -9,
     );
 
     $form['node_link'] = array(
@@ -417,7 +434,7 @@ function nodereference_url_field_widget_form(&$form, &$form_state, $field, $inst
       $element += array(
         '#type' => 'textfield',
         '#default_value' => isset($items[$delta]['nid']) ? $items[$delta]['nid'] : NULL,
-        '#autocomplete_path' => 'node_reference/autocomplete/' . $instance['entity_type'] . '/' . $field['field_name'],
+        '#autocomplete_path' => 'node_reference/autocomplete/' . $instance['entity_type'] . '/' . $instance['bundle'] . '/' . $field['field_name'],
         '#value_callback' => 'node_reference_autocomplete_value',
         '#element_validate' => array('node_reference_autocomplete_validate'),
       );