diff --git a/CHANGES.md b/CHANGES.md
index b478ebc940..5db6cde1c1 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,7 @@
 - Added container names to docker-compose.yml (@drandell)
 - Upgraded ClamAV container image to version 1.0.9
 - Optimised function execution by using fully-qualified function calls
+- Added support for boolean 'true' and 'false' in query strings alongside 1 and 0
 - New and consistent response format for all API object + new response examples in the docs
   - Removed user roles attribute from user object (can be fetched from /v1/teams/memberships) **
   - Removed type attribute from session object response (used only internally)
@@ -38,6 +39,12 @@
 - Fixed wrong JSON validation when creating and updating database documnets
 - Fixed bug where max file size was limited to max of 10MB
 - Fixed bug preventing the deletion of the project logo
+- Fixed Bug when trying to overwrite OAuth cookie in the Flutter SDK
+- Fixed OAuth redirect when using the self-hosted instance default success URL ([#454](https://github.com/appwrite/appwrite/issues/454))
+- Fixed bug denying authentication with Github OAuth provider
+
+## Breaking Changes
+- **Deprecated** `first` and `last` query params for documents list route in the database API
 
 ## Security
 
diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index 4faa5b45a1..b29a2401e3 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -29,8 +29,8 @@ use DeviceDetector\DeviceDetector;
 use GeoIp2\Database\Reader;
 use Utopia\Validator\ArrayList;
 
-$oauthDefaultSuccess = $utopia->getEnv('_APP_HOME').'/auth/oauth2/success';
-$oauthDefaultFailure = $utopia->getEnv('_APP_HOME').'/auth/oauth2/failure';
+$oauthDefaultSuccess = '/auth/oauth2/success';
+$oauthDefaultFailure = '/auth/oauth2/failure';
 
 $oauth2Keys = [];
 
@@ -78,9 +78,8 @@ $utopia->post('/v1/account')
                 }
             }
 
-            $profile = $projectDB->getCollection([ // Get user by email address
+            $profile = $projectDB->getCollectionFirst([ // Get user by email address
                 'limit' => 1,
-                'first' => true,
                 'filters' => [
                     '$collection='.Database::SYSTEM_COLLECTION_USERS,
                     'email='.$email,
@@ -153,9 +152,8 @@ $utopia->post('/v1/account/sessions')
     ->action(
         function ($email, $password) use ($response, $request, $projectDB, $audit, $webhook) {
             $protocol = Config::getParam('protocol');
-            $profile = $projectDB->getCollection([ // Get user by email address
+            $profile = $projectDB->getCollectionFirst([ // Get user by email address
                 'limit' => 1,
-                'first' => true,
                 'filters' => [
                     '$collection='.Database::SYSTEM_COLLECTION_USERS,
                     'email='.$email,
@@ -409,9 +407,8 @@ $utopia->get('/v1/account/sessions/oauth2/:provider/redirect')
                 $projectDB->deleteDocument($current); //throw new Exception('User already logged in', 401);
             }
 
-            $user = (empty($user->getId())) ? $projectDB->getCollection([ // Get user by provider id
+            $user = (empty($user->getId())) ? $projectDB->getCollectionFirst([ // Get user by provider id
                 'limit' => 1,
-                'first' => true,
                 'filters' => [
                     '$collection='.Database::SYSTEM_COLLECTION_USERS,
                     'oauth2'.\ucfirst($provider).'='.$oauth2ID,
@@ -422,9 +419,8 @@ $utopia->get('/v1/account/sessions/oauth2/:provider/redirect')
                 $name = $oauth2->getUserName($accessToken);
                 $email = $oauth2->getUserEmail($accessToken);
 
-                $user = $projectDB->getCollection([ // Get user by provider email address
+                $user = $projectDB->getCollectionFirst([ // Get user by provider email address
                     'limit' => 1,
-                    'first' => true,
                     'filters' => [
                         '$collection='.Database::SYSTEM_COLLECTION_USERS,
                         'email='.$email,
@@ -500,8 +496,9 @@ $utopia->get('/v1/account/sessions/oauth2/:provider/redirect')
                     ->addHeader('X-Fallback-Cookies', \json_encode([Auth::$cookieName => Auth::encodeSession($user->getId(), $secret)]))
                 ;
             }
-
-            if ($state['success'] === $oauthDefaultSuccess) { // Add keys for non-web platforms
+            
+            // Add keys for non-web platforms - TODO - add verification phase to aviod session sniffing
+            if (parse_url($state['success'], PHP_URL_PATH) === $oauthDefaultSuccess) {
                 $state['success'] = URLParser::parse($state['success']);
                 $query = URLParser::parseQuery($state['success']['query']);
                 $query['project'] = $project->getId();
@@ -774,9 +771,8 @@ $utopia->patch('/v1/account/email')
                 throw new Exception('Invalid credentials', 401);
             }
 
-            $profile = $projectDB->getCollection([ // Get user by email address
+            $profile = $projectDB->getCollectionFirst([ // Get user by email address
                 'limit' => 1,
-                'first' => true,
                 'filters' => [
                     '$collection='.Database::SYSTEM_COLLECTION_USERS,
                     'email='.$email,
@@ -1030,9 +1026,8 @@ $utopia->post('/v1/account/recovery')
     ->param('url', '', function () use ($clients) { return new Host($clients); }, 'URL to redirect the user back to your app from the recovery email. Only URLs from hostnames in your project platform list are allowed. This requirement helps to prevent an [open redirect](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html) attack against your project API.')
     ->action(
         function ($email, $url) use ($request, $response, $projectDB, $mail, $audit, $project) {
-            $profile = $projectDB->getCollection([ // Get user by email address
+            $profile = $projectDB->getCollectionFirst([ // Get user by email address
                 'limit' => 1,
-                'first' => true,
                 'filters' => [
                     '$collection='.Database::SYSTEM_COLLECTION_USERS,
                     'email='.$email,
@@ -1136,9 +1131,8 @@ $utopia->put('/v1/account/recovery')
                 throw new Exception('Passwords must match', 400);
             }
 
-            $profile = $projectDB->getCollection([ // Get user by email address
+            $profile = $projectDB->getCollectionFirst([ // Get user by email address
                 'limit' => 1,
-                'first' => true,
                 'filters' => [
                     '$collection='.Database::SYSTEM_COLLECTION_USERS,
                     '$id='.$userId,
@@ -1288,9 +1282,8 @@ $utopia->put('/v1/account/verification')
     ->param('secret', '', function () { return new Text(256); }, 'Valid verification token.')
     ->action(
         function ($userId, $secret) use ($response, $user, $projectDB, $audit) {
-            $profile = $projectDB->getCollection([ // Get user by email address
+            $profile = $projectDB->getCollectionFirst([ // Get user by email address
                 'limit' => 1,
-                'first' => true,
                 'filters' => [
                     '$collection='.Database::SYSTEM_COLLECTION_USERS,
                     '$id='.$userId,
diff --git a/app/controllers/api/avatars.php b/app/controllers/api/avatars.php
index 90f8ac34c8..9e888f7f7d 100644
--- a/app/controllers/api/avatars.php
+++ b/app/controllers/api/avatars.php
@@ -3,6 +3,7 @@
 global $utopia, $request, $response;
 
 use Utopia\Exception;
+use Utopia\Validator\Boolean;
 use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;
 use Utopia\Validator\Range;
@@ -364,7 +365,7 @@ $utopia->get('/v1/avatars/qr')
     ->param('text', '', function () { return new Text(512); }, 'Plain text to be converted to QR code image.')
     ->param('size', 400, function () { return new Range(0, 1000); }, 'QR code size. Pass an integer between 0 to 1000. Defaults to 400.', true)
     ->param('margin', 1, function () { return new Range(0, 10); }, 'Margin from edge. Pass an integer between 0 to 10. Defaults to 1.', true)
-    ->param('download', 0, function () { return new Range(0, 1); }, 'Return resulting image with \'Content-Disposition: attachment \' headers for the browser to start downloading it. Pass 0 for no header, or 1 for otherwise. Default value is set to 0.', true)
+    ->param('download', false, function () { return new Boolean(true); }, 'Return resulting image with \'Content-Disposition: attachment \' headers for the browser to start downloading it. Pass 0 for no header, or 1 for otherwise. Default value is set to 0.', true)
     ->label('scope', 'avatars.read')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'avatars')
@@ -373,6 +374,8 @@ $utopia->get('/v1/avatars/qr')
     ->label('sdk.description', '/docs/references/avatars/get-qr.md')
     ->action(
         function ($text, $size, $margin, $download) use ($response) {
+            $download = ($download === '1' || $download === 'true' || $download === 1 || $download === true);
+
             $renderer = new ImageRenderer(
                 new RendererStyle($size, $margin),
                 new ImagickImageBackEnd('png', 100)
diff --git a/app/controllers/api/database.php b/app/controllers/api/database.php
index b4b4479b89..c6accbb269 100644
--- a/app/controllers/api/database.php
+++ b/app/controllers/api/database.php
@@ -5,14 +5,15 @@ global $utopia, $register, $request, $response, $webhook, $audit, $projectDB;
 use Utopia\App;
 use Utopia\Exception;
 use Utopia\Response;
+use Utopia\Validator\Boolean;
 use Utopia\Validator\Range;
 use Utopia\Validator\WhiteList;
 use Utopia\Validator\Text;
 use Utopia\Validator\ArrayList;
 use Utopia\Validator\JSON;
-use Utopia\Locale\Locale;
-use Utopia\Audit\Audit;
-use Utopia\Audit\Adapters\MySQL as AuditAdapter;
+// use Utopia\Locale\Locale;
+// use Utopia\Audit\Audit;
+// use Utopia\Audit\Adapters\MySQL as AuditAdapter;
 use Appwrite\Database\Database;
 use Appwrite\Database\Document;
 use Appwrite\Database\Validator\UID;
@@ -22,8 +23,9 @@ use Appwrite\Database\Validator\Collection;
 use Appwrite\Database\Validator\Authorization;
 use Appwrite\Database\Exception\Authorization as AuthorizationException;
 use Appwrite\Database\Exception\Structure as StructureException;
-use DeviceDetector\DeviceDetector;
-use GeoIp2\Database\Reader;
+
+// use DeviceDetector\DeviceDetector;
+// use GeoIp2\Database\Reader;
 
 $utopia->post('/v1/database/collections')
     ->desc('Create Collection')
@@ -462,10 +464,8 @@ $utopia->get('/v1/database/collections/:collectionId/documents')
     ->param('orderType', 'ASC', function () { return new WhiteList(array('DESC', 'ASC')); }, 'Order direction. Possible values are DESC for descending order, or ASC for ascending order.', true)
     ->param('orderCast', 'string', function () { return new WhiteList(array('int', 'string', 'date', 'time', 'datetime')); }, 'Order field type casting. Possible values are int, string, date, time or datetime. The database will attempt to cast the order field to the value you pass here. The default value is a string.', true)
     ->param('search', '', function () { return new Text(256); }, 'Search query. Enter any free text search. The database will try to find a match against all document attributes and children.', true)
-    ->param('first', 0, function () { return new Range(0, 1); }, 'Return only the first document. Pass 1 for true or 0 for false. The default value is 0.', true)
-    ->param('last', 0, function () { return new Range(0, 1); }, 'Return only the last document. Pass 1 for true or 0 for false. The default value is 0.', true)
     ->action(
-        function ($collectionId, $filters, $offset, $limit, $orderField, $orderType, $orderCast, $search, $first, $last) use ($response, $projectDB, $utopia) {
+        function ($collectionId, $filters, $offset, $limit, $orderField, $orderType, $orderCast, $search) use ($response, $projectDB, $utopia) {
             $collection = $projectDB->getDocument($collectionId, false);
 
             if (\is_null($collection->getId()) || Database::SYSTEM_COLLECTION_COLLECTIONS != $collection->getCollection()) {
@@ -479,38 +479,32 @@ $utopia->get('/v1/database/collections/:collectionId/documents')
                 'orderType' => $orderType,
                 'orderCast' => $orderCast,
                 'search' => $search,
-                'first' => (bool) $first,
-                'last' => (bool) $last,
                 'filters' => \array_merge($filters, [
                     '$collection='.$collectionId,
                 ]),
             ]);
 
-            if ($first || $last) {
-                $response->json((!empty($list) ? $list->getArrayCopy() : []));
-            } else {
-                if ($utopia->isDevelopment()) {
-                    $collection
-                        ->setAttribute('debug', $projectDB->getDebug())
-                        ->setAttribute('limit', $limit)
-                        ->setAttribute('offset', $offset)
-                        ->setAttribute('orderField', $orderField)
-                        ->setAttribute('orderType', $orderType)
-                        ->setAttribute('orderCast', $orderCast)
-                        ->setAttribute('filters', $filters)
-                    ;
-                }
-
+            if ($utopia->isDevelopment()) {
                 $collection
-                    ->setAttribute('sum', $projectDB->getSum())
-                    ->setAttribute('documents', $list)
+                    ->setAttribute('debug', $projectDB->getDebug())
+                    ->setAttribute('limit', $limit)
+                    ->setAttribute('offset', $offset)
+                    ->setAttribute('orderField', $orderField)
+                    ->setAttribute('orderType', $orderType)
+                    ->setAttribute('orderCast', $orderCast)
+                    ->setAttribute('filters', $filters)
                 ;
-
-                /*
-                 * View
-                 */
-                $response->json($collection->getArrayCopy(/*['$id', '$collection', 'name', 'documents']*/[], ['rules']));
             }
+
+            $collection
+                ->setAttribute('sum', $projectDB->getSum())
+                ->setAttribute('documents', $list)
+            ;
+
+            /*
+             * View
+             */
+            $response->json($collection->getArrayCopy(/*['$id', '$collection', 'name', 'documents']*/[], ['rules']));
         }
     );
 
diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php
index 3311abbd0b..bd49422398 100644
--- a/app/controllers/api/projects.php
+++ b/app/controllers/api/projects.php
@@ -5,10 +5,10 @@ global $utopia, $request, $response, $register, $user, $consoleDB, $projectDB, $
 use Utopia\Exception;
 use Utopia\Response;
 use Utopia\Validator\ArrayList;
+use Utopia\Validator\Boolean;
 use Utopia\Validator\Domain as DomainValidator;
 use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;
-use Utopia\Validator\Range;
 use Utopia\Validator\URL;
 use Utopia\Config\Config;
 use Utopia\Domains\Domain;
@@ -454,7 +454,7 @@ $utopia->post('/v1/projects/:projectId/webhooks')
     ->param('name', null, function () { return new Text(256); }, 'Webhook name.')
     ->param('events', null, function () { return new ArrayList(new Text(256)); }, 'Webhook events list.')
     ->param('url', null, function () { return new Text(2000); }, 'Webhook URL.')
-    ->param('security', null, function () { return new Range(0, 1); }, 'Certificate verification, 0 for disabled or 1 for enabled.')
+    ->param('security', false, function () { return new Boolean(true); }, 'Certificate verification, false for disabled or true for enabled.')
     ->param('httpUser', '', function () { return new Text(256); }, 'Webhook HTTP user.', true)
     ->param('httpPass', '', function () { return new Text(256); }, 'Webhook HTTP password.', true)
     ->action(
@@ -465,6 +465,7 @@ $utopia->post('/v1/projects/:projectId/webhooks')
                 throw new Exception('Project not found', 404);
             }
 
+            $security = ($security === '1' || $security === 'true' || $security === 1 || $security === true);
             $key = $request->getServer('_APP_OPENSSL_KEY_V1');
             $iv = OpenSSL::randomPseudoBytes(OpenSSL::cipherIVLength(OpenSSL::CIPHER_AES_128_GCM));
             $tag = null;
@@ -587,8 +588,7 @@ $utopia->put('/v1/projects/:projectId/webhooks/:webhookId')
     ->param('name', null, function () { return new Text(256); }, 'Webhook name.')
     ->param('events', null, function () { return new ArrayList(new Text(256)); }, 'Webhook events list.')
     ->param('url', null, function () { return new Text(2000); }, 'Webhook URL.')
-    ->param('security', null, function () { return new Range(0, 1); }, 'Certificate verification, 0 for disabled or 1 for enabled.')
-    ->param('httpUser', '', function () { return new Text(256); }, 'Webhook HTTP user.', true)
+    ->param('security', false, function () { return new Boolean(true); }, 'Certificate verification, false for disabled or true for enabled.')    ->param('httpUser', '', function () { return new Text(256); }, 'Webhook HTTP user.', true)
     ->param('httpPass', '', function () { return new Text(256); }, 'Webhook HTTP password.', true)
     ->action(
         function ($projectId, $webhookId, $name, $events, $url, $security, $httpUser, $httpPass) use ($request, $response, $consoleDB) {
@@ -598,6 +598,7 @@ $utopia->put('/v1/projects/:projectId/webhooks/:webhookId')
                 throw new Exception('Project not found', 404);
             }
 
+            $security = ($security === '1' || $security === 'true' || $security === 1 || $security === true);
             $key = $request->getServer('_APP_OPENSSL_KEY_V1');
             $iv = OpenSSL::randomPseudoBytes(OpenSSL::cipherIVLength(OpenSSL::CIPHER_AES_128_GCM));
             $tag = null;
@@ -835,8 +836,7 @@ $utopia->post('/v1/projects/:projectId/tasks')
     ->param('name', null, function () { return new Text(256); }, 'Task name.')
     ->param('status', null, function () { return new WhiteList(['play', 'pause']); }, 'Task status.')
     ->param('schedule', null, function () { return new Cron(); }, 'Task schedule CRON syntax.')
-    ->param('security', null, function () { return new Range(0, 1); }, 'Certificate verification, 0 for disabled or 1 for enabled.')
-    ->param('httpMethod', '', function () { return new WhiteList(['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT']); }, 'Task HTTP method.')
+    ->param('security', false, function () { return new Boolean(true); }, 'Certificate verification, false for disabled or true for enabled.')    ->param('httpMethod', '', function () { return new WhiteList(['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT']); }, 'Task HTTP method.')
     ->param('httpUrl', '', function () { return new URL(); }, 'Task HTTP URL')
     ->param('httpHeaders', null, function () { return new ArrayList(new Text(256)); }, 'Task HTTP headers list.', true)
     ->param('httpUser', '', function () { return new Text(256); }, 'Task HTTP user.', true)
@@ -852,6 +852,7 @@ $utopia->post('/v1/projects/:projectId/tasks')
             $cron = CronExpression::factory($schedule);
             $next = ($status == 'play') ? $cron->getNextRunDate()->format('U') : null;
 
+            $security = ($security === '1' || $security === 'true' || $security === 1 || $security === true);
             $key = $request->getServer('_APP_OPENSSL_KEY_V1');
             $iv = OpenSSL::randomPseudoBytes(OpenSSL::cipherIVLength(OpenSSL::CIPHER_AES_128_GCM));
             $tag = null;
@@ -985,7 +986,7 @@ $utopia->put('/v1/projects/:projectId/tasks/:taskId')
     ->param('name', null, function () { return new Text(256); }, 'Task name.')
     ->param('status', null, function () { return new WhiteList(['play', 'pause']); }, 'Task status.')
     ->param('schedule', null, function () { return new Cron(); }, 'Task schedule CRON syntax.')
-    ->param('security', null, function () { return new Range(0, 1); }, 'Certificate verification, 0 for disabled or 1 for enabled.')
+    ->param('security', false, function () { return new Boolean(true); }, 'Certificate verification, false for disabled or true for enabled.')
     ->param('httpMethod', '', function () { return new WhiteList(['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'HEAD', 'OPTIONS', 'TRACE', 'CONNECT']); }, 'Task HTTP method.')
     ->param('httpUrl', '', function () { return new URL(); }, 'Task HTTP URL.')
     ->param('httpHeaders', null, function () { return new ArrayList(new Text(256)); }, 'Task HTTP headers list.', true)
@@ -1008,6 +1009,7 @@ $utopia->put('/v1/projects/:projectId/tasks/:taskId')
             $cron = CronExpression::factory($schedule);
             $next = ($status == 'play') ? $cron->getNextRunDate()->format('U') : null;
 
+            $security = ($security === '1' || $security === 'true' || $security === 1 || $security === true);
             $key = $request->getServer('_APP_OPENSSL_KEY_V1');
             $iv = OpenSSL::randomPseudoBytes(OpenSSL::cipherIVLength(OpenSSL::CIPHER_AES_128_GCM));
             $tag = null;
diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index d5a7071449..d69a39bed6 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -237,9 +237,8 @@ $utopia->post('/v1/teams/:teamId/memberships')
                 ],
             ]);
 
-            $invitee = $projectDB->getCollection([ // Get user by email address
+            $invitee = $projectDB->getCollectionFirst([ // Get user by email address
                 'limit' => 1,
-                'first' => true,
                 'filters' => [
                     '$collection='.Database::SYSTEM_COLLECTION_USERS,
                     'email='.$email,
@@ -468,9 +467,8 @@ $utopia->patch('/v1/teams/:teamId/memberships/:inviteId/status')
             }
 
             if (empty($user->getId())) {
-                $user = $projectDB->getCollection([ // Get user
+                $user = $projectDB->getCollectionFirst([ // Get user
                     'limit' => 1,
-                    'first' => true,
                     'filters' => [
                         '$collection='.Database::SYSTEM_COLLECTION_USERS,
                         '$id='.$userId,
diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php
index d60ad57dd4..dd02524bdc 100644
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@@ -34,9 +34,8 @@ $utopia->post('/v1/users')
     ->param('name', '', function () { return new Text(100); }, 'User name.', true)
     ->action(
         function ($email, $password, $name) use ($response, $projectDB) {
-            $profile = $projectDB->getCollection([ // Get user by email address
+            $profile = $projectDB->getCollectionFirst([ // Get user by email address
                 'limit' => 1,
-                'first' => true,
                 'filters' => [
                     '$collection='.Database::SYSTEM_COLLECTION_USERS,
                     'email='.$email,
diff --git a/app/controllers/web/home.php b/app/controllers/web/home.php
index 3a4269a012..cf29b5d495 100644
--- a/app/controllers/web/home.php
+++ b/app/controllers/web/home.php
@@ -457,6 +457,10 @@ $utopia->get('/open-api-2.json')
                                 $node['type'] = 'string';
                                 $node['x-example'] = '['.\strtoupper(fromCamelCase($node['name'])).']';
                                 break;
+                            case 'Utopia\Validator\Boolean':
+                                $node['type'] = 'boolean';
+                                $node['x-example'] = false;
+                                break;
                             case 'Appwrite\Database\Validator\UID':
                                 $node['type'] = 'string';
                                 $node['x-example'] = '['.\strtoupper(fromCamelCase($node['name'])).']';
diff --git a/app/workers/certificates.php b/app/workers/certificates.php
index b04c7409c0..22c3a14e63 100644
--- a/app/workers/certificates.php
+++ b/app/workers/certificates.php
@@ -77,7 +77,7 @@ class CertificatesV1
             }
         }
 
-        $certificate = $consoleDB->getCollection([
+        $certificate = $consoleDB->getCollectionFirst([
             'limit' => 1,
             'offset' => 0,
             'orderField' => 'id',
@@ -87,7 +87,6 @@ class CertificatesV1
                 '$collection='.Database::SYSTEM_COLLECTION_CERTIFICATES,
                 'domain='.$domain->get(),
             ],
-            'first' => true,
         ]);
 
         // $condition = ($certificate
diff --git a/composer.lock b/composer.lock
index e08ed94b4c..a281b54401 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2141,24 +2141,23 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "790426f28bfcbfc1a6f1d59ee8c986edfa45395c"
+                "reference": "664187301bfbc87e686df212094e6817805c3ab8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/790426f28bfcbfc1a6f1d59ee8c986edfa45395c",
-                "reference": "790426f28bfcbfc1a6f1d59ee8c986edfa45395c",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/664187301bfbc87e686df212094e6817805c3ab8",
+                "reference": "664187301bfbc87e686df212094e6817805c3ab8",
                 "shasum": ""
             },
             "require": {
-                "ext-filter": "^7.1",
-                "php": "^7.2",
+                "ext-filter": "*",
+                "php": "^7.2 || ^8.0",
                 "phpdocumentor/reflection-common": "^2.0",
                 "phpdocumentor/type-resolver": "^1.0",
                 "webmozart/assert": "^1"
             },
             "require-dev": {
-                "doctrine/instantiator": "^1",
-                "mockery/mockery": "^1"
+                "mockery/mockery": "1.3.*"
             },
             "type": "library",
             "extra": {
@@ -2186,7 +2185,7 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2020-06-19T18:58:43+00:00"
+            "time": "2020-06-27T17:33:53+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
diff --git a/docker-compose.yml b/docker-compose.yml
index ba3470822a..58b273c56c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -52,7 +52,11 @@ services:
       - ./phpunit.xml:/usr/share/nginx/html/phpunit.xml
       - ./tests:/usr/share/nginx/html/tests
       - ./app:/usr/share/nginx/html/app
+<<<<<<< HEAD
       - ./vendor:/usr/share/nginx/html/vendor
+=======
+     # - ./vendor:/usr/share/nginx/html/vendor
+>>>>>>> 8d92ee4e3e05cbacd87b1ef7282e599a36f56f77
       - ./docs:/usr/share/nginx/html/docs
       - ./public:/usr/share/nginx/html/public
       - ./src:/usr/share/nginx/html/src
diff --git a/src/Appwrite/Auth/OAuth2.php b/src/Appwrite/Auth/OAuth2.php
index 2882746608..5a92049fce 100644
--- a/src/Appwrite/Auth/OAuth2.php
+++ b/src/Appwrite/Auth/OAuth2.php
@@ -138,7 +138,7 @@ abstract class OAuth2
         \curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $method);
         \curl_setopt($ch, CURLOPT_HEADER, 0);
         \curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        \curl_setopt($ch, CURLOPT_USERAGENT, '');
+        \curl_setopt($ch, CURLOPT_USERAGENT, 'Appwrite OAuth2');
 
         if (!empty($payload)) {
             \curl_setopt($ch, CURLOPT_POSTFIELDS, $payload);
diff --git a/src/Appwrite/Auth/OAuth2/GitHub.php b/src/Appwrite/Auth/OAuth2/Github.php
similarity index 97%
rename from src/Appwrite/Auth/OAuth2/GitHub.php
rename to src/Appwrite/Auth/OAuth2/Github.php
index 882f2d3f2a..cd02252092 100644
--- a/src/Appwrite/Auth/OAuth2/GitHub.php
+++ b/src/Appwrite/Auth/OAuth2/Github.php
@@ -15,7 +15,7 @@ class Github extends OAuth2
      * @var array
      */
     protected $scopes = [
-        'user:email'
+        'user:email',
     ];
 
     /**
@@ -78,6 +78,7 @@ class Github extends OAuth2
     {
         $user = $this->getUser($accessToken);
 
+        var_dump($user);
         if (isset($user['id'])) {
             return $user['id'];
         }
@@ -125,7 +126,7 @@ class Github extends OAuth2
      * @return array
      */
     protected function getUser(string $accessToken)
-    {
+    {        
         if (empty($this->user)) {
             $this->user = \json_decode($this->request('GET', 'https://api.github.com/user', ['Authorization: token '.\urlencode($accessToken)]), true);
         }
diff --git a/src/Appwrite/Database/Database.php b/src/Appwrite/Database/Database.php
index b19872dfb1..18267e3c62 100644
--- a/src/Appwrite/Database/Database.php
+++ b/src/Appwrite/Database/Database.php
@@ -130,8 +130,6 @@ class Database
             'orderField' => '$id',
             'orderType' => 'ASC',
             'orderCast' => 'int',
-            'first' => false,
-            'last' => false,
             'filters' => [],
         ], $options);
 
@@ -141,17 +139,31 @@ class Database
             $node = new Document($node);
         }
 
-        if ($options['first']) {
-            $results = \reset($results);
-        }
-
-        if ($options['last']) {
-            $results = \end($results);
-        }
-
         return $results;
     }
 
+    /**
+     * @param array $options
+     *
+     * @return Document
+     */
+    public function getCollectionFirst(array $options)
+    {
+        $results = $this->getCollection($options);
+        return \reset($results);
+    }
+
+    /**
+     * @param array $options
+     *
+     * @return Document
+     */
+    public function getCollectionLast(array $options)
+    {
+        $results = $this->getCollection($options);
+        return \end($results);
+    }
+
     /**
      * @param int  $id
      * @param bool $mock is mocked data allowed?
diff --git a/tests/e2e/Services/Database/DatabaseBase.php b/tests/e2e/Services/Database/DatabaseBase.php
index 60dc1f81cc..7e68940104 100644
--- a/tests/e2e/Services/Database/DatabaseBase.php
+++ b/tests/e2e/Services/Database/DatabaseBase.php
@@ -317,41 +317,6 @@ trait DatabaseBase
         return [];
     }
 
-    /**
-     * @depends testCreateDocument
-     */
-    public function testListDocumentsFirstAndLast(array $data):array
-    {
-        $documents = $this->client->call(Client::METHOD_GET, '/database/collections/' . $data['moviesId'] . '/documents', array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()), [
-            'limit' => 1,
-            'orderField' => 'releaseYear',
-            'orderType' => 'ASC',
-            'orderCast' => 'int',
-            'first' => true,
-        ]);
-
-        $this->assertEquals(1944, $documents['body']['releaseYear']);
-
-        $documents = $this->client->call(Client::METHOD_GET, '/database/collections/' . $data['moviesId'] . '/documents', array_merge([
-            'content-type' => 'application/json',
-            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()), [
-            'limit' => 2,
-            'offset' => 1,
-            'orderField' => 'releaseYear',
-            'orderType' => 'ASC',
-            'orderCast' => 'int',
-            'last' => true,
-        ]);
-
-        $this->assertEquals(2019, $documents['body']['releaseYear']);
-
-        return [];
-    }
-
     /**
      * @depends testCreateDocument
      */