[2.2] Fix /shop/ base URL Non Latin issue with url decode

Fixes #6512