diff --git a/docs/usage.rst b/docs/usage.rst
index 6c6dfff..86e3434 100644
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -472,7 +472,7 @@ use_sorted_tags
     ``sort`` keys. Will return the tag name instead of the date.
 
 query
-    A query string use to filter tags when ``use_sorted_tags`` is set (see
+    A query string use to filter tags when ``use_sorted_tags`` set (see
     `here <https://developer.atlassian.com/cloud/bitbucket/rest/intro/#querying>`__
     for examples). The string does not need to be escaped.
 
diff --git a/nvchecker_source/bitbucket.py b/nvchecker_source/bitbucket.py
index f934db2..6039454 100644
--- a/nvchecker_source/bitbucket.py
+++ b/nvchecker_source/bitbucket.py
@@ -21,29 +21,33 @@ async def get_version(
   use_max_tag = conf.get('use_max_tag', False)
   use_sorted_tags = conf.get('use_sorted_tags', False)
 
-  if use_sorted_tags:
-    url = BITBUCKET_MAX_TAG % repo
+  if use_sorted_tags or use_max_tag:
+    parameters = {'fields': 'values.name,next'}
 
-    parameters = {'sort': conf.get('sort', '-target.date')}
-    if 'query' in conf:
+    if use_sorted_tags:
+      parameters['sort'] = conf.get('sort', '-target.date')
+      if 'query' in conf:
         parameters['q'] = conf['query']
 
+  if use_sorted_tags:
+    url = BITBUCKET_MAX_TAG % repo
     url += '?' + urlencode(parameters)
-    data = await _get_tags(url, max_page=1, cache=cache)
+
+    version = await _get_tags(url, max_page=1, cache=cache)
 
   elif use_max_tag:
     url = BITBUCKET_MAX_TAG % repo
+    url += '?' + urlencode(parameters)
+
     max_page = conf.get('max_page', 3)
-    data = await _get_tags(url, max_page=max_page, cache=cache)
+    version = await _get_tags(url, max_page=max_page, cache=cache)
 
   else:
     url = BITBUCKET_URL % (repo, br)
     data = await cache.get_json(url)
 
-  if use_max_tag or use_sorted_tags:
-    version = data
-  else:
     version = data['values'][0]['date'].split('T', 1)[0].replace('-', '')
+
   return version
 
 async def _get_tags(
@@ -51,7 +55,7 @@ async def _get_tags(
   max_page: int,
   cache: AsyncCache,
 ) -> List[str]:
-  ret = []
+  ret: List[str] = []
 
   for _ in range(max_page):
     data = await cache.get_json(url)