improved language scope in routing