CallerId Lookup does not urlencode plus(+) sign

When dealing with numbers in international format with a plus sign the CURL Address for HTTP based lookups does not urlencode the + sign or anything else for that matter.

It is possible to use
cid=${STRREPLACE(CALLERID(num),"+",%2B)}  instead of
cid=[NUMBER] for the query

but that I consider to be a dirty hack and the query field is truncated in the web interface after reload.

The url shoud be encoded by the callerid plugin.