Proper handling of modifiers during routing