history entries should have the same parent as the actual entries
Made placeholder mappings more robust