diff --git a/__pycache__/runtest.cpython-37-pytest-6.2.2.pyc b/__pycache__/runtest.cpython-37-pytest-6.2.2.pyc
new file mode 100644
index 0000000..168b359
Binary files /dev/null and b/__pycache__/runtest.cpython-37-pytest-6.2.2.pyc differ
diff --git a/docs/conf.py b/docs/conf.py
index d9a738b..c0f3d92 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -22,7 +22,7 @@
 author = 'Tianning Li'
 
 # The full version, including alpha/beta/rc tags
-release = '0.11.1'
+release = '0.12.0'
 
 
 # -- General configuration ---------------------------------------------------
diff --git a/finvizfinance/__init__.py b/finvizfinance/__init__.py
index 0858124..1b47fb8 100644
--- a/finvizfinance/__init__.py
+++ b/finvizfinance/__init__.py
@@ -5,5 +5,5 @@
 .. moduleauthor:: Tianning Li <ltianningli@gmail.com>
 """
 
-__version__ = "0.11.0"
+__version__ = "0.12.0"
 __author__ = "Tianning Li"
diff --git a/finvizfinance/screener/custom.py b/finvizfinance/screener/custom.py
index 7f3249f..ac6aa75 100644
--- a/finvizfinance/screener/custom.py
+++ b/finvizfinance/screener/custom.py
@@ -182,7 +182,7 @@ def screener_view(
             else:
                 progress_bar(1, 1)
 
-        table = soup.findAll("table")[18]
+        table = soup.findAll("table")[19]
         rows = table.findAll("tr")
         table_header = [i.text for i in rows[0].findAll("td")][1:]
         num_col_index = [table_header.index(i) for i in table_header if i in NUMBER_COL]
diff --git a/finvizfinance/screener/overview.py b/finvizfinance/screener/overview.py
index fcc876e..7560dd8 100644
--- a/finvizfinance/screener/overview.py
+++ b/finvizfinance/screener/overview.py
@@ -162,7 +162,7 @@ def set_filter(self, signal="", filters_dict={}, ticker=""):
 
     def _get_page(self, soup):
         """Check the page number"""
-        options = soup.findAll("table")[17].findAll("option")
+        options = soup.find(id="pageSelect").findAll("option")
         return len(options)
 
     def _get_table(self, rows, df, num_col_index, table_header, limit=-1):
@@ -254,7 +254,7 @@ def screener_view(
             else:
                 progress_bar(1, 1)
 
-        table = soup.findAll("table")[18]
+        table = soup.findAll("table")[19]
         rows = table.findAll("tr")
         table_header = [i.text for i in rows[0].findAll("td")][1:]
         num_col_index = [table_header.index(i) for i in table_header if i in NUMBER_COL]
diff --git a/finvizfinance/screener/ticker.py b/finvizfinance/screener/ticker.py
index 88d0d44..0bffb99 100644
--- a/finvizfinance/screener/ticker.py
+++ b/finvizfinance/screener/ticker.py
@@ -23,7 +23,7 @@ def __init__(self):
         Overview._load_setting(self)
 
     def _screener_helper(self, i, page, soup, tickers, limit):
-        table = soup.findAll("table")[18]
+        table = soup.findAll("table")[19]
         page_tickers = table.findAll("span")
         if i == page - 1:
             page_tickers = page_tickers[: ((limit - 1) % 1000 + 1)]
diff --git a/release.md b/release.md
index 73d0f24..391196d 100644
--- a/release.md
+++ b/release.md
@@ -1,5 +1,6 @@
 | Date | Version | Comment |
 | ------------- | ------------- | ------------- |
+| 2022/05/02 | 0.12.0 | Update changes in stock screener. Issue: https://github.com/lit26/finvizfinance/issues/41|
 | 2021/12/30 | 0.11.1 | Update changes in stock fundamental. Issue: https://github.com/lit26/finvizfinance/issues/38. PR: https://github.com/lit26/finvizfinance/pull/37 |
 | 2021/12/11 | 0.11 | Reformat the code to follow PEP 8 style guide. |
 | 2021/10/14 | 0.10.1 | Add pagination to the screener. https://github.com/lit26/finvizfinance/issues/29  |
diff --git a/requirements-doc.txt b/requirements-doc.txt
new file mode 100644
index 0000000..d11c352
--- /dev/null
+++ b/requirements-doc.txt
@@ -0,0 +1,6 @@
+-r requirements.txt
+
+# doc
+Sphinx==2.2.1
+sphinx-rtd-theme==0.4.3
+docutils==0.17.1
\ No newline at end of file
diff --git a/setup.py b/setup.py
index c96e3d9..43c4042 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 
 HERE = pathlib.Path(__file__).parent
 
-VERSION = '0.11.1'
+VERSION = '0.12.0'
 PACKAGE_NAME = 'finvizfinance'
 AUTHOR = 'Tianning Li'
 AUTHOR_EMAIL = 'ltianningli@gmail.com'
diff --git a/tsla.jpg b/tsla.jpg
new file mode 100644
index 0000000..d68b0d0
Binary files /dev/null and b/tsla.jpg differ