Added organization in kind for entity dialog