some fixes for organizations controller