83c83
<     $destination = drupal_urlencode($_REQUEST['q']);
---
>     $destination = removeLanguagePrefixFromDestination(drupal_urlencode($_REQUEST['q']));
106a107,117
> 
> function removeLanguagePrefixFromDestination($destination)
> {
>     $elements = explode('/', $destination);
>     $prefix = $elements[0];
>     $languages = language_list();
>     foreach ($languages as $lang)
>       if(strcasecmp($prefix, $lang->language)==0)
>         return substr($destination, strlen($prefix)+1); // remove prefix with slash
>     return $destination;
> }
\ No newline at end of file