Goncalo/bug fix/occurrence names