Fixing tag routing
Merge pull request #5347 from Hackwar/tagsrouter

Fixing tag routing