diff --git a/scripts/commands/database/export.js b/scripts/commands/database/export.js
index e7a003624..ddb53848c 100644
--- a/scripts/commands/database/export.js
+++ b/scripts/commands/database/export.js
@@ -9,11 +9,15 @@ async function main() {
   streams = _.sortBy(streams, 'channel_id')
   streams = streams.map(stream => {
     return {
-      channel: stream.channel_id,
-      display_name: stream.display_name,
+      channel: stream.channel,
+      title: stream.title,
       url: stream.url,
-      http_referrer: stream.http['referrer'],
-      user_agent: stream.http['user-agent']
+      width: stream.width,
+      height: stream.height,
+      bitrate: stream.bitrate,
+      is_online: stream.is_online,
+      http_referrer: stream.http_referrer,
+      user_agent: stream.user_agent
     }
   })
 
diff --git a/tests/__data__/expected/.gh-pages/streams.json b/tests/__data__/expected/.gh-pages/streams.json
index 42cf48c7d..7948d55d0 100644
--- a/tests/__data__/expected/.gh-pages/streams.json
+++ b/tests/__data__/expected/.gh-pages/streams.json
@@ -1 +1 @@
-[{"channel":"AndorraTV.ad","display_name":"ATV (720p) [Offline]","url":"https://iptv-all.lanesh4d0w.repl.co/andorra/atv","http_referrer":"","user_agent":""},{"channel":"AndorraTV.ad","display_name":"Andorra TV (720p) [Not 24/7]","url":"http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8","http_referrer":"","user_agent":""},{"channel":"BBCNews.uk","display_name":"BBC News HD (720p) [Not 24/7]","url":"https://query-streamlink.herokuapp.com/iptv-query?streaming-ip=https://www.twitch.tv/absliveantigua3/","http_referrer":"","user_agent":""},{"channel":"LDPRTV.ru","display_name":"ЛДПР ТВ (1080p)","url":"http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8","http_referrer":"","user_agent":""}]
\ No newline at end of file
+[{"channel":"LDPRTV.ru","title":"ЛДПР ТВ","url":"http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8","is_online":false,"http_referrer":"","user_agent":""},{"channel":"BBCNews.uk","title":"BBC News HD","url":"http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8","is_online":true,"http_referrer":"","user_agent":""},{"channel":"AndorraTV.ad","title":"ATV","url":"https://iptv-all.lanesh4d0w.repl.co/andorra/atv","is_online":false,"http_referrer":"","user_agent":""},{"channel":"BBCNewsHD.ad","title":"BBC News HD","url":"https://master.starmena-cloud.com/hls/libyas.m3u8","width":1024,"height":576,"bitrate":0,"is_online":true,"http_referrer":"","user_agent":""},{"channel":"KayhanTV.af","title":"Kayhan TV","url":"http://208.93.117.113/live/Stream1/playlist.m3u8","is_online":false,"http_referrer":"","user_agent":""},{"channel":"Sharq.af","title":"Sharq","url":"https://forerunnerrtmp.livestreamingcdn.com/output18/output18.stream/playlist.m3u8","width":1280,"height":720,"bitrate":2226543,"is_online":true,"http_referrer":"","user_agent":""}]
\ No newline at end of file
diff --git a/tests/__data__/input/database/db_export.streams.db b/tests/__data__/input/database/db_export.streams.db
new file mode 100644
index 000000000..294185b27
--- /dev/null
+++ b/tests/__data__/input/database/db_export.streams.db
@@ -0,0 +1,6 @@
+{"title":"ЛДПР ТВ","channel":"LDPRTV.ru","filepath":"tests/__data__/output/channels/ru.m3u","url":"http://46.46.143.222:1935/live/mp4:ldpr.stream/playlist.m3u8","http_referrer":"","user_agent":"","cluster_id":1,"_id":"2ST8btby3mmsgPF0","is_online":false}
+{"title":"BBC News HD","channel":"BBCNews.uk","filepath":"tests/__data__/output/channels/uk.m3u","url":"http://1111296894.rsc.cdn77.org/LS-ATL-54548-6/index.m3u8","http_referrer":"","user_agent":"","cluster_id":3,"_id":"3TbieV1ptnZVCIdn","is_online":true}
+{"title":"ATV","channel":"AndorraTV.ad","filepath":"tests/__data__/output/channels/ad.m3u","url":"https://iptv-all.lanesh4d0w.repl.co/andorra/atv","http_referrer":"","user_agent":"","cluster_id":1,"_id":"I6cjG2xCBRFFP4sz","is_online":false}
+{"title":"BBC News HD","channel":"BBCNewsHD.ad","filepath":"tests/__data__/output/channels/uk.m3u","url":"https://master.starmena-cloud.com/hls/libyas.m3u8","http_referrer":"","user_agent":"","cluster_id":3,"_id":"WTbieV1ptnZVCIdn","is_online":true,"bitrate":0,"width":1024,"height":576}
+{"title":"Kayhan TV","channel":"KayhanTV.af","filepath":"channels/af.m3u","url":"http://208.93.117.113/live/Stream1/playlist.m3u8","http_referrer":"","user_agent":"","cluster_id":1,"_id":"cFFpFVzSn6xFMUF3","is_online":false}
+{"title":"Sharq","channel":"Sharq.af","filepath":"channels/af.m3u","bitrate":2226543,"width":1280,"height":720,"url":"https://forerunnerrtmp.livestreamingcdn.com/output18/output18.stream/playlist.m3u8","http_referrer":"","user_agent":"","cluster_id":1,"_id":"u7iyA6cjtf1iWWAZ","is_online":true}
diff --git a/tests/commands/database/export.test.js b/tests/commands/database/export.test.js
index a6ddb3285..ae7c00b56 100644
--- a/tests/commands/database/export.test.js
+++ b/tests/commands/database/export.test.js
@@ -4,7 +4,7 @@ const fs = require('fs-extra')
 beforeEach(() => {
   fs.emptyDirSync('tests/__data__/output')
   fs.copyFileSync(
-    'tests/__data__/input/database/base_streams.db',
+    'tests/__data__/input/database/db_export.streams.db',
     'tests/__data__/output/streams.db'
   )