tidy queries so that it at least compiles
remove person organisation affiliation
more changes associated with removing person organisation affiliation