diff --git a/in/rds.html.mako b/in/rds.html.mako
index 19e2468..08f5503 100644
--- a/in/rds.html.mako
+++ b/in/rds.html.mako
@@ -201,7 +201,9 @@
           <td class="storage">
             <% storage = inst['storage'] %>
             % if storage == 'EBS Only':
-            <span sort="0">0 GiB (EBS only)</span>
+            <span sort="1">0 GiB (EBS only)</span>
+            % elif 'Aurora' in inst['storage']:
+            <span sort="0">Aurora I/O Optimized</span>
             % else:
             <% products = [int(s) for s in storage.split() if s.isdigit()] %>
             <span sort="${products[0]*products[1]}">${inst['storage']}</span>
diff --git a/opensearch.py b/opensearch.py
index 9cedc62..ad4de1d 100755
--- a/opensearch.py
+++ b/opensearch.py
@@ -67,7 +67,7 @@ def add_pretty_names(instances):
 def add_volume_quotas(instances):
     os_quotas_url = "https://docs.aws.amazon.com/opensearch-service/latest/developerguide/limits.html"
     tree = etree.parse(urllib2.urlopen(os_quotas_url), etree.HTMLParser())
-    table = tree.xpath('//div[@class="table-contents disable-scroll"]//table')[6]
+    table = tree.xpath('//div[@class="table-contents disable-scroll"]//table')[1]
     rows = table.xpath(".//tr[./td]")
 
     for r in rows:
@@ -80,7 +80,7 @@ def add_volume_quotas(instances):
         instances[instance_type]["max_ebs_gp2"] = max_ebs_gp2
         instances[instance_type]["max_ebs_gp3"] = max_ebs_gp3
 
-    table = tree.xpath('//div[@class="table-contents disable-scroll"]//table')[7]
+    table = tree.xpath('//div[@class="table-contents disable-scroll"]//table')[2]
     rows = table.xpath(".//tr[./td]")
     for r in rows:
         instance_type = etree.tostring(r[0], method="text").strip().decode()