Added unique id to items and use internally instead of name