Fixed bug where objects with & in the name would cause problems