diff --git a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaUpdateService.java b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaUpdateService.java
index f7b6e321..4b035962 100644
--- a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaUpdateService.java
+++ b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaUpdateService.java
@@ -62,6 +62,7 @@ public class CamsodaUpdateService extends PaginatedScheduledService {
                                     if(result.has("tpl")) {
                                         JSONArray tpl = result.getJSONArray("tpl");
                                         String name = tpl.getString(0);
+                                        String displayName = tpl.getString(1);
                                         // int connections = tpl.getInt(2);
                                         String streamName = tpl.getString(5);
                                         String tsize = tpl.getString(6);
@@ -77,11 +78,11 @@ public class CamsodaUpdateService extends PaginatedScheduledService {
                                             JSONArray edgeServers = result.getJSONArray("edge_servers");
                                             model.setStreamUrl("https://" + edgeServers.getString(0) + "/cam/mp4:" + streamName + "_h264_aac_480p/playlist.m3u8");
                                         }
+                                        model.setDisplayName(displayName);
                                         models.add(model);
                                     } else {
                                         String name = result.getString("username");
                                         CamsodaModel model = (CamsodaModel) camsoda.createModel(name);
-
                                         if(result.has("server_prefix")) {
                                             String serverPrefix = result.getString("server_prefix");
                                             String streamName = result.getString("stream_name");
@@ -91,6 +92,10 @@ public class CamsodaUpdateService extends PaginatedScheduledService {
                                                 model.setOnlineState(result.getString("status"));
                                             }
 
+                                            if(result.has("display_name")) {
+                                                model.setDisplayName(result.getString("display_name"));
+                                            }
+
                                             if(result.has("edge_servers")) {
                                                 JSONArray edgeServers = result.getJSONArray("edge_servers");
                                                 model.setStreamUrl("https://" + edgeServers.getString(0) + "/cam/mp4:" + streamName + "_h264_aac_480p/playlist.m3u8");
diff --git a/common/src/main/java/ctbrec/sites/camsoda/Camsoda.java b/common/src/main/java/ctbrec/sites/camsoda/Camsoda.java
index 346c9315..3008f14b 100644
--- a/common/src/main/java/ctbrec/sites/camsoda/Camsoda.java
+++ b/common/src/main/java/ctbrec/sites/camsoda/Camsoda.java
@@ -140,6 +140,9 @@ public class Camsoda extends AbstractSite {
                         if(thumb != null) {
                             model.setPreview("https:" + thumb);
                         }
+                        if(result.has("display_name")) {
+                            model.setDisplayName(result.getString("display_name"));
+                        }
                         models.add(model);
                     }
                     return models;
diff --git a/common/src/main/java/ctbrec/sites/chaturbate/ChaturbateModel.java b/common/src/main/java/ctbrec/sites/chaturbate/ChaturbateModel.java
index 6328840f..5ca806c1 100644
--- a/common/src/main/java/ctbrec/sites/chaturbate/ChaturbateModel.java
+++ b/common/src/main/java/ctbrec/sites/chaturbate/ChaturbateModel.java
@@ -111,6 +111,9 @@ public class ChaturbateModel extends AbstractModel {
                 String baseUrl = masterUrl.substring(0, masterUrl.lastIndexOf('/') + 1);
                 String segmentUri = baseUrl + playlist.getUri();
                 src.mediaPlaylistUrl = segmentUri;
+                if(src.mediaPlaylistUrl.contains("?")) {
+                    src.mediaPlaylistUrl = src.mediaPlaylistUrl.substring(0, src.mediaPlaylistUrl.lastIndexOf('?'));
+                }
                 LOG.trace("Media playlist {}", src.mediaPlaylistUrl);
                 sources.add(src);
             }