Fix form and display organizations as a tree