Also found several duplicate ids that were split up; these will be replaced with classes later.
(ticket #1804)