Last of the occurs work for the organisation schema #142

Tidies up the final uncertainties