Refactored Searchable Organisations