Issue 304 organisations short name