more improvements to routing for specific stores