Language switcher does not work well with Catalog

Steps to reproduce bug:

1- Navigate to Catalog (/catalog)

2- The Catalog is displayed in English

3- Click on a category. In my case 'category/catalog/stickers'

4- Using the language switcher block choose another language. (in my case Japanese,'ja').

5- The language switcher sends the user to catalog/15. It should be sending me to ja/category/catalog/ステッカー instead! catalog/15 is the English page, catalog/16 is the Japanese page)

6- And vice versa, if I first go to the Japanese catalog page, using the language switcher sends me to catalog/15 instead of category/catalog/stickers and again, only the category image is shown, no products are listed.

== Some observations ==

1- Going to catalog/15 display all the English products in that category (good)

2- If you manually go to catalog/16 you get the category page, in Japanese, but no products are listed

3- I tried to create an alias to ja/catalog/16 but got an error saying 'The path 'ja/catalog/16' is either invalid or you do not have access to it.'