diff --git a/mod/events.php b/mod/events.php
index 22a9b4677d..5f6a589d2e 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -339,7 +339,7 @@ function events_content(App $a) {
 
 		// get events by id or by date
 		if ($event_params['event_id']) {
-			$r = Event::getListById(local_user(), $event_params['event-id']);
+			$r = Event::getListById(local_user(), $event_params['event_id']);
 		} else {
 			$r = Event::getListByDate(local_user(), $event_params);
 		}
@@ -370,7 +370,7 @@ function events_content(App $a) {
 		}
 
 		if (x($_GET, 'id')) {
-			$tpl =  get_markup_template("event.tpl");
+			$tpl = get_markup_template("event.tpl");
 		} else {
 			$tpl = get_markup_template("events_js.tpl");
 		}
diff --git a/src/Model/Event.php b/src/Model/Event.php
index 978dce7cf6..87c8b239bf 100644
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -504,6 +504,7 @@ class Event extends BaseObject
 		}
 
 		// Query for the event by date.
+		// @todo Slow query (518 seconds to run), to be optimzed
 		$r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
 					`item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event`
 				LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`