Search in CPT with WPML from home page -> goes to wrong language

Hi,

I found an issue when searching on CPT from the home page or the location page & the language is in French:

– The search result will point to /?geodir_search=1&stype=gd_restaurant&s=c&snear=&sgeodir_cuisine%5B%5D=&sgeo_lat=&sgeo_lon= instead of /fr/?geodir_search=1&stype=gd_restaurant&s=c&snear=&sgeodir_cuisine%5B%5D=&sgeo_lat=&sgeo_lon= (missing the /fr/ for the language)

Interestingly it’s only with CPT, it works fine with the default post type.
And also worth noting, the same thing works fine when the search is made from the listings page.

I’m planning to go live with our directory in the next 24 hours and this is a bit blocking.

Best,
Marc