Core pr 4

Updated to use Drupal core auto-complete functions.