Handle oEmbeds better