Organizations with invalid address is saved now
Minor refactoring