diff --git a/lib/docs/filters/numpy/clean_html.rb b/lib/docs/filters/numpy/clean_html.rb
index 54871eed..33085662 100644
--- a/lib/docs/filters/numpy/clean_html.rb
+++ b/lib/docs/filters/numpy/clean_html.rb
@@ -2,7 +2,8 @@ module Docs
   class Numpy
     class CleanHtmlFilter < Filter
       def call
-        at_css('#spc-section-body, main > div')
+        css('.sphinx-bs.container.pb-4.docutils').remove if root_page?
+        at_css('main > div > section', '#spc-section-body, main > div')
       end
     end
   end
diff --git a/lib/docs/filters/numpy/entries.rb b/lib/docs/filters/numpy/entries.rb
index 20cc9197..f6c43dd7 100644
--- a/lib/docs/filters/numpy/entries.rb
+++ b/lib/docs/filters/numpy/entries.rb
@@ -19,7 +19,7 @@ module Docs
             return 'Development'
           end
           li_a = css('nav li.active > a')
-          return li_a.last.content if li_a
+          return li_a.last.content if li_a && li_a.last
         end
 
         nav_items = css('.nav.nav-pills.pull-left > li')
diff --git a/lib/docs/scrapers/numpy.rb b/lib/docs/scrapers/numpy.rb
index cebd8ee7..22fba843 100644
--- a/lib/docs/scrapers/numpy.rb
+++ b/lib/docs/scrapers/numpy.rb
@@ -26,14 +26,20 @@ module Docs
       Licensed under the 3-clause BSD License.
     HTML
 
+    version '1.22' do
+      self.release = '1.22.0'
+      self.base_url = "https://numpy.org/doc/#{self.version}/"
+      options[:container] = nil
+    end
+
     version '1.21' do
-      self.release = '1.21.4'
+      self.release = '1.21.5'
       self.base_url = "https://numpy.org/doc/#{self.version}/"
       options[:container] = nil
     end
 
     version '1.20' do
-      self.release = '1.20.1'
+      self.release = '1.20.3'
       self.base_url = "https://numpy.org/doc/#{self.version}/"
       options[:container] = nil
     end