Add support for organisation queries by ID