diff --git a/src/public/index.php b/src/public/index.php
index ea1e71b..78182e1 100644
--- a/src/public/index.php
+++ b/src/public/index.php
@@ -30,12 +30,12 @@ try {
 }
 
 // Prepare request
-$requestTheme    =  isset($_GET['theme']) && in_array(['default'], $_GET['theme']) ? $_GET['theme'] : 'default';
-$requestTime     = !empty($_GET['time']) ? (int) $_GET['time'] : time();
-$requestSort     = !empty($_GET['sort']) && in_array($_GET['sort'], ['timeOnline', 'uptimeAvg', 'sentSum', 'receivedSum', 'address']) ? $_GET['sort'] : 'timeOnline';
-$requestOrder    = !empty($_GET['order']) && in_array($_GET['order'], ['ASC', 'DESC']) ? $_GET['order'] : 'DESC';
-$requestPage     = !empty($_GET['page']) && $_GET['page'] > 1 ? (int) $_GET['page'] : 1;
-$requestCalendar = !empty($_GET['calendar']) && in_array($_GET['calendar'], ['peers', 'traffic']) ? $_GET['calendar'] : 'peers';
+$requestTheme    = isset($_GET['theme']) && in_array(['default'], $_GET['theme']) ? $_GET['theme'] : 'default';
+$requestTime     = time(); // @TODO !empty($_GET['time']) ? (int) $_GET['time'] : time();
+$requestSort     = isset($_GET['sort']) && in_array($_GET['sort'], ['timeOnline', 'uptimeAvg', 'sentSum', 'receivedSum', 'address']) ? $_GET['sort'] : 'timeOnline';
+$requestOrder    = isset($_GET['order']) && in_array($_GET['order'], ['ASC', 'DESC']) ? $_GET['order'] : 'DESC';
+$requestPage     = isset($_GET['page']) && $_GET['page'] > 1 ? (int) $_GET['page'] : 1;
+$requestCalendar = isset($_GET['calendar']) && in_array($_GET['calendar'], ['peers', 'traffic']) ? $_GET['calendar'] : 'peers';
 
 // app begin
 $calendar = new Yggverse\Graph\Calendar\Month($requestTime);
diff --git a/src/public/peer.php b/src/public/peer.php
index 49e1c9e..6c1b393 100644
--- a/src/public/peer.php
+++ b/src/public/peer.php
@@ -32,12 +32,12 @@ try {
 // Prepare request
 $requestPeerId   = isset($_GET['peerId']) ? (int) $_GET['peerId'] : 0;
 
-$requestTheme    = !empty($_GET['theme']) && in_array(['default'], $_GET['theme']) ? $_GET['theme'] : 'default';
-$requestTime     = !empty($_GET['time']) ? (int) $_GET['time'] : time();
-$requestSort     = !empty($_GET['sort']) && in_array($_GET['sort'], ['peerConnection.timeAdded']) ? $_GET['sort'] : 'peerConnection.timeAdded';
-$requestOrder    = !empty($_GET['order']) && in_array($_GET['order'], ['ASC', 'DESC']) ? $_GET['order'] : 'DESC';
-$requestPage     = !empty($_GET['page']) && $_GET['page'] > 1 ? (int) $_GET['page'] : 1;
-$requestCalendar = !empty($_GET['calendar']) && in_array($_GET['calendar'], ['traffic']) ? $_GET['calendar'] : 'traffic';
+$requestTheme    = isset($_GET['theme']) && in_array(['default'], $_GET['theme']) ? $_GET['theme'] : 'default';
+$requestTime     = time(); // @TODO !empty($_GET['time']) ? (int) $_GET['time'] : time();
+$requestSort     = isset($_GET['sort']) && in_array($_GET['sort'], ['peerConnection.timeAdded']) ? $_GET['sort'] : 'peerConnection.timeAdded';
+$requestOrder    = isset($_GET['order']) && in_array($_GET['order'], ['ASC', 'DESC']) ? $_GET['order'] : 'DESC';
+$requestPage     = isset($_GET['page']) && $_GET['page'] > 1 ? (int) $_GET['page'] : 1;
+$requestCalendar = isset($_GET['calendar']) && in_array($_GET['calendar'], ['traffic']) ? $_GET['calendar'] : 'traffic';
 
 // App controller begin
 $calendar = new Yggverse\Graph\Calendar\Month($requestTime);