--- a/web/client.php	Tue Mar 13 23:46:06 2012 +0100
+++ b/web/client.php	Fri Mar 16 19:29:48 2012 +0100
@@ -58,7 +58,7 @@
     
     <!-- CSS -->
     <link rel="stylesheet" href="<?php echo(registry_url('fancybox','css'));?>" type="text/css" media="screen">
-    <link rel="stylesheet" href="<?php echo(registry_url('tweetcast','css'));?>" type="text/css" media="screen, projection"/>
+    <link rel="stylesheet" href="<?php echo(registry_url('tweetcast','css'));?>?42" type="text/css" media="screen, projection"/>
 
     <!-- JAVASCRIPT -->
     <script type="text/javascript" src="<?php echo(registry_url('jquery','js'))?>"></script>
@@ -69,7 +69,13 @@
     <script type="text/javascript" src="<?php echo(registry_url('fancybox','js'))?>"></script>
     
     <script type="text/javascript">
-        <?php if (isset($config['hashtag'])) echo "var tracking_keywords = ".json_encode(array($config['hashtag'])).";"; ?>
+        <?php
+        if (isset($config['tracking_keywords']) && count($config['tracking_keywords'])) {
+            echo "var tracking_keywords = ".json_encode($config['tracking_keywords']).';';
+        } elseif (isset($config['hashtag'])) {
+            echo "var tracking_keywords = ".json_encode(array($config['hashtag'])).";";
+        }
+        ?>
         <?php if (isset($config['suggested_keywords'])) echo "var suggested_keywords = ".json_encode($config['suggested_keywords']).";"; ?>
         <?php if (isset($config['js_config'])) echo $config['js_config']; ?>
     </script>
@@ -244,7 +250,7 @@
                 </ul>
                 <div class="ifwrap" id="vlWrap">
                     <div id="videoLivePlayer">
-                    <?php if ($config['islive']):?>
+                    <?php if (isset($config['islive']) && $config['islive']):?>
                         <object id="player" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" name="player" width="<?php echo $videoWidth; ?>" height="<?php echo $videoHeight; ?>">
                             <param name="movie" value="<?php echo(URL_ROOT); ?>res/mediaplayer/player.swf" />
                             <param name="allowfullscreen" value="true" />