Fix address controller add/edit