diff --git a/booking.variety_admin.inc b/booking.variety_admin.inc
index 59d0e54..62a2a9c 100644
--- a/booking.variety_admin.inc
+++ b/booking.variety_admin.inc
@@ -14,8 +14,16 @@ function booking_variety_admin() {
   // tabledrag example http://dropbucket.org/node/204
   $form = array ();	
   $options = array ();
-	$result = db_query("SELECT * FROM {booking_variety_timeslots} WHERE booking_eventid = :eid", 
-					array(':eid' => $event->eid));  
+  //$result = db_query("SELECT * FROM {booking_variety_timeslots}");
+	//$result = db_query("SELECT * FROM {booking_variety_timeslots} WHERE booking_eventid = :eid", 
+  //				array(':eid' => $event->eid));  
+  
+  $query = db_select('booking_variety_timeslots', 't');		
+  $query->leftJoin('booking_event', 'e', 't.booking_eventid = e.booking_eventid');	 
+  $query->fields('t')
+    ->fields('e')
+    ->condition('p.booking_eventid', $event->eid, '=');
+  $result = $query->execute();  
 
   $header = array (
     'eid' => t('Event'),
@@ -32,7 +40,7 @@ function booking_variety_admin() {
 
   foreach($result as $data) {
     $options[$data->tid] = array (
-      'eid' => $event->booking_eventname,
+      'eid' => $data->booking_eventname,
       'tid' => $data->tid,
       'booking_variety_time_descrip' => $data->booking_variety_time_descrip,
       'booking_variety_status' => $data->booking_variety_status == 1 ? "Enabled" : "Disabled",
@@ -159,9 +167,9 @@ function booking_variety_timeslot_form_submit($form, &$form_state) {
   if ($form_state['values']['op'] == 'Create') {							
     db_insert('booking_variety_timeslots')
       ->fields(array(	
-          'booking_eventid' => $event->eid,
-          'booking_variety_status' => $values['booking_variety_status'] == 1 ? 1 : 0,
-          'booking_variety_time_descrip' => $values['booking_variety_time_descrip'],			
+        'booking_eventid' => $event->eid,
+        'booking_variety_status' => $values['booking_variety_status'] == 1 ? 1 : 0,
+        'booking_variety_time_descrip' => $values['booking_variety_time_descrip'],			
         'booking_variety_start' => _datetime_array_to_ts($values['booking_variety_start']),
         'booking_variety_end' => _datetime_array_to_ts($values['booking_variety_end']),
       ))