Quick fix to solve latest gestio academica change in the backend. Needs more testing and refactors, but it seems to mostly work