Some work done on organisation search and other minor things