Change the metric tagging being sent from the router
Refactor router handler spec and disambiguate index tags