[cogenda-web] - Refactor and add some cases