diff --git a/databaseOperations.php b/databaseOperations.php
index 618c50f..97d499a 100755
--- a/databaseOperations.php
+++ b/databaseOperations.php
@@ -197,10 +197,18 @@ function getEventsByDateAndCategories($db, $date, $categories)
 {
     try
     {
-        $request = $db->prepare('SELECT * FROM event NATURAL JOIN eventCategorie NATURAL JOIN categorie WHERE (dtstart <= :date AND dtend >= :date) AND events.categorie IN (:categories)');
+        $usableCategories = array();
+        foreach($categories as $cat => $useThisCategorie)
+        {
+            if($useThisCategorie)
+                $usableCategories[] = $cat;
+        }
+
+        $request = $db->prepare('SELECT DISTINCT event_id, event_title FROM event NATURAL JOIN eventCategorie WHERE (event_dtstart <= :date_max AND event_dtend >= :date_min) AND cat_id IN (:categories)');
         $request->execute(array(
-                                    'date'=>date("Y-m-d",$date),
-                                    'categories'=>implode(',', array_map('intval', $categories))
+            'date_max'=>date("Y-m-d 23:59:59",$date),
+            'date_min'=>date("Y-m-d 00:00:00", $date),
+            'categories'=>implode(',', array_map('intval', $usableCategories))
         ));
         $result = $request->fetchAll();
         $request->closeCursor();
@@ -251,7 +259,7 @@ function addEvent($db, $titre, $localisation, $dtstart, $dtend, $description, $u
                                 'url'=>$url,
                                 'urlImage'=>$urlImage,
                                 'contact'=>$contact));
-                                    echo("debug");
+        echo("debug");
         $request->closeCursor();
     }
     catch(PDOException $e)
diff --git a/index.php b/index.php
index ed57123..5801ff4 100644
--- a/index.php
+++ b/index.php
@@ -64,7 +64,7 @@ else
                                 $cat_id = $categories[$cat_it]['cat_id'];
                                 $cat_title = $categories[$cat_it]['cat_title'];
                         ?>
-                        <input class="categorie-checkbox" type="checkbox" id="cat_<?php echo $cat_id; ?>" name="cat_<?php echo $cat_id; ?>" <?php if($_SESSION['categorieStatus'][$cat_id]) echo 'checked'; ?> />
+                        <input class="categorie-checkbox" type="checkbox" id="cat_<?php echo $cat_id; ?>" name="cat_<?php echo $cat_id; ?>" <?php if(isset($_SESSION['categorieStatus'][$cat_id]) && $_SESSION['categorieStatus'][$cat_id]) echo 'checked'; ?> />
                         <label for="cat_<?php echo $cat_id; ?>"><span></span><?php echo $cat_title;?></label><br />
                         <?php
                             }
@@ -100,7 +100,7 @@ else
                     $date = strtotime('+1 day', $date)
                    )
                 {
-                    $events = getEventsByDate($db, $date);
+                    $events = getEventsByDateAndCategories($db, $date, $_SESSION['categorieStatus']);
 
                     $class = '';
                     if(date('m', $date) != date('m', $monthDate))