Third party issue: Amasty Improved Layered Navigation: Brands | Store switching issue with URL

[TimQSO]

I'm not sure if this could be considered as a bug, but Amasty Shop by Brand has an issue with the store switcher.

Amasty Shop By Brand add a brand page to a shop with all the brands, example here:

https://shop-by-brand-m2.magento-demo.amasty.com/brands

The pages still work with your module enabled. However, using a store switcher while being on this page results in a incorrent url, for example:

https://www.mysite.com/nl/merken

The store switcher redirects to:

https://www.mysite.com/mysite_en/brands

While it should be:

https://www.mysite.com/en/brands

We are able to solve this minor issue by adding a rewrite to Nginx:

location /mysite_en/ {
    rewrite ^/mysite_en/(.*)$ $scheme://$host/en/$1 permanent;
}