Add fix for store switcher urls