Fix org handler formatting