Fix issue #4416

Fix opengraph and and oembed issues #4987 & #4416