CMS-1113 UpdateSpaces should only update one entry