Resuelto parte del issue #99
Resueltos issues DEPARTAMENTO: issue #89, issue #87