remove console logs
Add organisation subtypes
Put subtype is null deeper inside parantheses, so that it is or-ed with the subtype in clause