Changing the way control options are added to the to_map to see if that stops duplication of controls