fixes to handle multiple company addresselector fields