fix routing issue

I don't understand why you're splitting on "__". Can you add a comment describing why? Or, better, you could extract this into a "parser" class and reuse it throughout this file.