diff --git a/miku/bot.lua b/miku/bot.lua
index 11ba05d..4aed423 100644
--- a/miku/bot.lua
+++ b/miku/bot.lua
@@ -451,6 +451,7 @@ function create_cred()
   google_cse_id = "",
   gitlab_private_token = "",
   gitlab_project_id = "",
+  iframely_api_key = "",
   instagram_access_token = "",
   lyricsnmusic_apikey = "",
   mal_username = "",
diff --git a/miku/encoding.lua b/miku/encoding.lua
index b2d33bf..dc54135 100644
--- a/miku/encoding.lua
+++ b/miku/encoding.lua
@@ -106,6 +106,10 @@ function unescape(str)
   str = string.gsub(str, '×', '×')	-- multiplication sign
   str = string.gsub(str, '÷', '÷')		-- division sign
   str = string.gsub(str, '÷', '÷')	-- division sign
+  str = string.gsub(str, '‎', '')		-- left-to-right mark
+  str = string.gsub(str, '‎', '')		-- left-to-right mark
+  str = string.gsub(str, '‏', '')		-- right-to-left mark
+  str = string.gsub(str, '‏', '')		-- right-to-left mark
   str = string.gsub(str, '–', '–')	-- en dash
   str = string.gsub(str, '–', '–')	-- en dash
   str = string.gsub(str, '—', '—')	-- em dash
diff --git a/miku/plugins/preview.lua b/miku/plugins/preview.lua
index 754f9ff..6f7df23 100644
--- a/miku/plugins/preview.lua
+++ b/miku/plugins/preview.lua
@@ -12,36 +12,43 @@ function preview:init(config)
 Erstellt einen Preview-Link]]
 end
 
+local api_key = cred_data.iframely_api_key
+
 function preview:inline_callback(inline_query, config, matches)
   local preview_url = matches[1]
-  local res, code = https.request('https://brawlbot.tk/apis/simple_meta_api/?url='..URL.escape(preview_url))
+  local res, code = http.request('http://iframe.ly/api/oembed?url='..URL.escape(preview_url)..'&api_key='..api_key)
   if code ~= 200 then abort_inline_query(inline_query) return end
   local data = json.decode(res)
-  if data.remote_code >= 400 then abort_inline_query(inline_query) return end
   
   if data.title then
-    title = data.title
+    title = data.title:gsub('"', '\\"')
   else
     title = 'Kein Titel'
   end
   
   if data.description then
-    description = data.description
+    description = data.description:gsub('"', '\\"')
 	description_in_text = '\n'..description
   else
 	description_in_text = ''
     description = 'Keine Beschreibung verfügbar'
   end
 
-  if data.only_name then
-    only_name = data.only_name
+  if data.provider_name then
+    provider_name = data.provider_name:gsub('"', '\\"')
   else
-    only_name = preview_url:match('^%w+://([^/]+)') -- we only need the domain
+    provider_name = preview_url:match('^%w+://([^/]+)') -- we only need the domain
   end
   
-  local message_text = '<b>'..title..'</b>'..description_in_text..'\n- '..only_name
+  if data.thumbnail_url then
+    thumb = data.thumbnail_url
+  else
+    thumb = 'https://anditest.perseus.uberspace.de/inlineQuerys/generic/internet.jpg'
+  end
+  
+  local message_text = '<b>'..title..'</b>'..description_in_text..'\n<i>- '..provider_name..'</i>'
 
-  local results = '[{"type":"article","id":"77","title":"'..title..'","description":"'..description..'","url":"'..preview_url..'","thumb_url":"https://anditest.perseus.uberspace.de/inlineQuerys/generic/internet.jpg","thumb_width":150,"thumb_height":150,"hide_url":true,"reply_markup":{"inline_keyboard":[[{"text":"Webseite aufrufen","url":"'..preview_url..'"}]]},"input_message_content":{"message_text":"'..message_text..'","parse_mode":"HTML","disable_web_page_preview":true}}]'
+  local results = '[{"type":"article","id":"77","title":"'..title..'","description":"'..description..'","url":"'..preview_url..'","thumb_url":"'..thumb..'","thumb_width":150,"thumb_height":150,"hide_url":true,"reply_markup":{"inline_keyboard":[[{"text":"Webseite aufrufen","url":"'..preview_url..'"}]]},"input_message_content":{"message_text":"'..message_text..'","parse_mode":"HTML","disable_web_page_preview":true}}]'
   utilities.answer_inline_query(inline_query, results, 3600, true)
 end