Fix: Several bug into supplier area