diff --git a/_includes/plotschema-reference.html b/_includes/plotschema-reference.html
index b17f2ab22706..41836da921f5 100644
--- a/_includes/plotschema-reference.html
+++ b/_includes/plotschema-reference.html
@@ -96,4 +96,7 @@
 {% capture curlyarrays %}{% raw %}{arrays}{% endraw %}{% endcapture %}
 {% capture curly2darray %}{% raw %}{2D array}{% endraw %}{% endcapture %}
 {% capture curlyobject %}{% raw %}{object}{% endraw %}{% endcapture %}
-{{ plotschemacontent | replace:'*',quote | replace:curlyarray,array | replace:curlyobject,object | replace:curlyarrays,arrays | replace:curly2darray,2darray | replace:"data_array",data_array | replace:"true",truestring | replace:"false",falsestring }}
+{{ plotschemacontent | replace:'*',quote |
+    replace:curlyarray,array | replace:curlyobject,object |
+    replace:curlyarrays,arrays | replace:curly2darray,2darray |
+    replace:"data_array",data_array | replace:"true",truestring | replace:"false",falsestring | normalize_whitespace }}
diff --git a/_includes/reference-block.html b/_includes/reference-block.html
index 3220dfa1bde7..9678ddbac826 100644
--- a/_includes/reference-block.html
+++ b/_includes/reference-block.html
@@ -1,11 +1,24 @@
 <ul>
 {% for obj in attribute %}
-    {% if obj[0] != "flags" and obj[0] != "role" and obj[0] != "extras" and obj[0] != "description" and obj[0] != "_isLinkedToArray" and obj[0] != "items" and obj[0] != "uid" and obj[0] != "smith" and obj[0] != "_deprecated" and obj[0] != "_isSubplotObj" and obj[0] != "editType" and obj[0] != "impliedEdits"%}
+    {% capture last_three %}{{ obj[0] | slice: -3, 3 }}{% endcapture %}
+    {% if last_three != "src" and obj[0] != "flags" and obj[0] != "stream" and obj[0] != "_arrayAttrRegexps"
+        and obj[0] != "role" and obj[0] != "extras"
+        and obj[0] != "description" and obj[0] != "_isLinkedToArray"
+        and obj[0] != "items" and obj[0] != "uid"
+        and obj[0] != "smith" and obj[0] != "_deprecated"
+        and obj[0] != "_isSubplotObj"
+        and obj[0] != "editType" and obj[0] != "impliedEdits"%}
 
         {% if obj[0] == "type" and page.language == "python" and block == "data" %}
             {% continue %}
         {% endif %}
 
+        {% if (obj[0] == "r" or obj[0] == "t")  and
+            (include.parentlink == "scatter" or include.parentlink == "scattergl" or include.parentlink == "bar" %}
+            {% continue %}
+        {% endif %}
+
+
         <li>
             {% if toc %}
                 {% assign id="" %}