Fixed routing error and partner matches bug