[IMP] More effort to avoid invoice partners