Fixed content extraction issues