Goncalo/improvements/occurrences display