Fixed formatting issue
Removed loop api call
Fixed display of organization drop-down