Switching language on frontend when item language is All

I have a site with real estate listings that are listed with language all and I'm having a couple of issues:

1
From the category page, when I click an item, it redirects to
/en/content-page/item/1199-438-paul
rather than
/en/land-for-sale-and-space-for-lease/item/1199-438-paul

If I set the language of the item to English, it then has the right URL, but that is not how the customer wants things to work. Is there a way to adjust this?

2
Having the items set to language All, if I hit the EN/FR button on the frontend because I want to view the item in the other language, I'm redirected to the home page because the article has to Language Association selected.

Is it possible to have it redirect from /en/land-for-sale-and-space-for-lease/item/1199-438-paul to /fr/terrains-a-vendre-et-espace-a-louer/item/1199-438-paul?

Thank you