Search query string gets double encoded when core Search block form is submitted

Hello,

RE: Lines 1506-1510 in apachesolr_seach.module

// Replace keys with their rawurldecoded value
if (isset($fv['search_block_form'])) {
$raw_keys = rawurlencode($fv['search_block_form']);
$form_state['redirect'] = str_replace($fv['search_block_form'], $raw_keys, $form_state['redirect']);
}

The comment says the keys will be replaced with urldecoded value, while the code replaces the keys with the urlencoded value.

This was the apparant cause for the double encoding of our search string on the search results page. The problem disappeared once I changed:
$raw_keys = rawurlencode($fv['search_block_form']) TO $raw_keys = rawurldecode($fv['search_block_form']);

Is this a legitimate bug or am I missing something? Let me know if I should generate a patch.

Thank you for all your hard work.

Regards,
Mike