diff --git a/TS.fsx b/TS.fsx
index ad5b81f74..3cbaf5dc3 100644
--- a/TS.fsx
+++ b/TS.fsx
@@ -129,6 +129,20 @@ let EmitGetElementsByTagNameOverloads (m: Browser.Method) =
             Pt.printl "getElementsByTagName(%s: \"%s\"): NodeListOf<%s>;" m.Params.[0].Name (e.Key.ToLower()) e.Value
         Pt.printl "getElementsByTagName(%s: string): NodeListOf<Element>;" m.Params.[0].Name
 
+/// Emit overloads for the querySelector method
+let EmitQuerySelectorOverloads (m: Browser.Method) =
+    if matchSingleParamMethodSignature m "querySelector" "Element" "string" then
+        for e in tagNameToEleName do
+            Pt.printl "querySelector(selectors: \"%s\"): %s;" (e.Key.ToLower()) e.Value
+        Pt.printl "querySelector(selectors: string): Element;"
+
+/// Emit overloads for the querySelectorAll method
+let EmitQuerySelectorAllOverloads (m: Browser.Method) =
+    if matchSingleParamMethodSignature m "querySelectorAll" "NodeList" "string" then
+        for e in tagNameToEleName do
+            Pt.printl "querySelectorAll(selectors: \"%s\"): NodeListOf<%s>;" (e.Key.ToLower()) e.Value
+        Pt.printl "querySelectorAll(selectors: string): NodeListOf<Element>;"
+
 /// Emit overloads for the createEvent method
 let EmitCreateEventOverloads (m: Browser.Method) =
     if matchSingleParamMethodSignature m "createEvent" "Event" "string" then
@@ -179,6 +193,8 @@ let EmitMethod flavor prefix (i:Browser.Interface) (m:Browser.Method) =
             | _, Some "createElement" -> EmitCreateElementOverloads m
             | _, Some "createEvent" -> EmitCreateEventOverloads m
             | _, Some "getElementsByTagName" -> EmitGetElementsByTagNameOverloads m
+            | _, Some "querySelector" -> EmitQuerySelectorOverloads m
+            | _, Some "querySelectorAll" -> EmitQuerySelectorAllOverloads m
             | _ ->
                 if m.Name.IsSome then
                     // If there are added overloads from the json files, print them first
diff --git a/baselines/dom.generated.d.ts b/baselines/dom.generated.d.ts
index 5c69d3dea..c71215563 100644
--- a/baselines/dom.generated.d.ts
+++ b/baselines/dom.generated.d.ts
@@ -13501,7 +13501,359 @@ interface NavigatorUserMedia {
 }
 
 interface NodeSelector {
+    querySelector(selectors: "a"): HTMLAnchorElement;
+    querySelector(selectors: "abbr"): HTMLElement;
+    querySelector(selectors: "acronym"): HTMLElement;
+    querySelector(selectors: "address"): HTMLElement;
+    querySelector(selectors: "applet"): HTMLAppletElement;
+    querySelector(selectors: "area"): HTMLAreaElement;
+    querySelector(selectors: "article"): HTMLElement;
+    querySelector(selectors: "aside"): HTMLElement;
+    querySelector(selectors: "audio"): HTMLAudioElement;
+    querySelector(selectors: "b"): HTMLElement;
+    querySelector(selectors: "base"): HTMLBaseElement;
+    querySelector(selectors: "basefont"): HTMLBaseFontElement;
+    querySelector(selectors: "bdo"): HTMLElement;
+    querySelector(selectors: "big"): HTMLElement;
+    querySelector(selectors: "blockquote"): HTMLQuoteElement;
+    querySelector(selectors: "body"): HTMLBodyElement;
+    querySelector(selectors: "br"): HTMLBRElement;
+    querySelector(selectors: "button"): HTMLButtonElement;
+    querySelector(selectors: "canvas"): HTMLCanvasElement;
+    querySelector(selectors: "caption"): HTMLTableCaptionElement;
+    querySelector(selectors: "center"): HTMLElement;
+    querySelector(selectors: "circle"): SVGCircleElement;
+    querySelector(selectors: "cite"): HTMLElement;
+    querySelector(selectors: "clippath"): SVGClipPathElement;
+    querySelector(selectors: "code"): HTMLElement;
+    querySelector(selectors: "col"): HTMLTableColElement;
+    querySelector(selectors: "colgroup"): HTMLTableColElement;
+    querySelector(selectors: "datalist"): HTMLDataListElement;
+    querySelector(selectors: "dd"): HTMLElement;
+    querySelector(selectors: "defs"): SVGDefsElement;
+    querySelector(selectors: "del"): HTMLModElement;
+    querySelector(selectors: "desc"): SVGDescElement;
+    querySelector(selectors: "dfn"): HTMLElement;
+    querySelector(selectors: "dir"): HTMLDirectoryElement;
+    querySelector(selectors: "div"): HTMLDivElement;
+    querySelector(selectors: "dl"): HTMLDListElement;
+    querySelector(selectors: "dt"): HTMLElement;
+    querySelector(selectors: "ellipse"): SVGEllipseElement;
+    querySelector(selectors: "em"): HTMLElement;
+    querySelector(selectors: "embed"): HTMLEmbedElement;
+    querySelector(selectors: "feblend"): SVGFEBlendElement;
+    querySelector(selectors: "fecolormatrix"): SVGFEColorMatrixElement;
+    querySelector(selectors: "fecomponenttransfer"): SVGFEComponentTransferElement;
+    querySelector(selectors: "fecomposite"): SVGFECompositeElement;
+    querySelector(selectors: "feconvolvematrix"): SVGFEConvolveMatrixElement;
+    querySelector(selectors: "fediffuselighting"): SVGFEDiffuseLightingElement;
+    querySelector(selectors: "fedisplacementmap"): SVGFEDisplacementMapElement;
+    querySelector(selectors: "fedistantlight"): SVGFEDistantLightElement;
+    querySelector(selectors: "feflood"): SVGFEFloodElement;
+    querySelector(selectors: "fefunca"): SVGFEFuncAElement;
+    querySelector(selectors: "fefuncb"): SVGFEFuncBElement;
+    querySelector(selectors: "fefuncg"): SVGFEFuncGElement;
+    querySelector(selectors: "fefuncr"): SVGFEFuncRElement;
+    querySelector(selectors: "fegaussianblur"): SVGFEGaussianBlurElement;
+    querySelector(selectors: "feimage"): SVGFEImageElement;
+    querySelector(selectors: "femerge"): SVGFEMergeElement;
+    querySelector(selectors: "femergenode"): SVGFEMergeNodeElement;
+    querySelector(selectors: "femorphology"): SVGFEMorphologyElement;
+    querySelector(selectors: "feoffset"): SVGFEOffsetElement;
+    querySelector(selectors: "fepointlight"): SVGFEPointLightElement;
+    querySelector(selectors: "fespecularlighting"): SVGFESpecularLightingElement;
+    querySelector(selectors: "fespotlight"): SVGFESpotLightElement;
+    querySelector(selectors: "fetile"): SVGFETileElement;
+    querySelector(selectors: "feturbulence"): SVGFETurbulenceElement;
+    querySelector(selectors: "fieldset"): HTMLFieldSetElement;
+    querySelector(selectors: "figcaption"): HTMLElement;
+    querySelector(selectors: "figure"): HTMLElement;
+    querySelector(selectors: "filter"): SVGFilterElement;
+    querySelector(selectors: "font"): HTMLFontElement;
+    querySelector(selectors: "footer"): HTMLElement;
+    querySelector(selectors: "foreignobject"): SVGForeignObjectElement;
+    querySelector(selectors: "form"): HTMLFormElement;
+    querySelector(selectors: "frame"): HTMLFrameElement;
+    querySelector(selectors: "frameset"): HTMLFrameSetElement;
+    querySelector(selectors: "g"): SVGGElement;
+    querySelector(selectors: "h1"): HTMLHeadingElement;
+    querySelector(selectors: "h2"): HTMLHeadingElement;
+    querySelector(selectors: "h3"): HTMLHeadingElement;
+    querySelector(selectors: "h4"): HTMLHeadingElement;
+    querySelector(selectors: "h5"): HTMLHeadingElement;
+    querySelector(selectors: "h6"): HTMLHeadingElement;
+    querySelector(selectors: "head"): HTMLHeadElement;
+    querySelector(selectors: "header"): HTMLElement;
+    querySelector(selectors: "hgroup"): HTMLElement;
+    querySelector(selectors: "hr"): HTMLHRElement;
+    querySelector(selectors: "html"): HTMLHtmlElement;
+    querySelector(selectors: "i"): HTMLElement;
+    querySelector(selectors: "iframe"): HTMLIFrameElement;
+    querySelector(selectors: "image"): SVGImageElement;
+    querySelector(selectors: "img"): HTMLImageElement;
+    querySelector(selectors: "input"): HTMLInputElement;
+    querySelector(selectors: "ins"): HTMLModElement;
+    querySelector(selectors: "isindex"): HTMLUnknownElement;
+    querySelector(selectors: "kbd"): HTMLElement;
+    querySelector(selectors: "keygen"): HTMLElement;
+    querySelector(selectors: "label"): HTMLLabelElement;
+    querySelector(selectors: "legend"): HTMLLegendElement;
+    querySelector(selectors: "li"): HTMLLIElement;
+    querySelector(selectors: "line"): SVGLineElement;
+    querySelector(selectors: "lineargradient"): SVGLinearGradientElement;
+    querySelector(selectors: "link"): HTMLLinkElement;
+    querySelector(selectors: "listing"): HTMLPreElement;
+    querySelector(selectors: "map"): HTMLMapElement;
+    querySelector(selectors: "mark"): HTMLElement;
+    querySelector(selectors: "marker"): SVGMarkerElement;
+    querySelector(selectors: "marquee"): HTMLMarqueeElement;
+    querySelector(selectors: "mask"): SVGMaskElement;
+    querySelector(selectors: "menu"): HTMLMenuElement;
+    querySelector(selectors: "meta"): HTMLMetaElement;
+    querySelector(selectors: "metadata"): SVGMetadataElement;
+    querySelector(selectors: "meter"): HTMLMeterElement;
+    querySelector(selectors: "nav"): HTMLElement;
+    querySelector(selectors: "nextid"): HTMLUnknownElement;
+    querySelector(selectors: "nobr"): HTMLElement;
+    querySelector(selectors: "noframes"): HTMLElement;
+    querySelector(selectors: "noscript"): HTMLElement;
+    querySelector(selectors: "object"): HTMLObjectElement;
+    querySelector(selectors: "ol"): HTMLOListElement;
+    querySelector(selectors: "optgroup"): HTMLOptGroupElement;
+    querySelector(selectors: "option"): HTMLOptionElement;
+    querySelector(selectors: "p"): HTMLParagraphElement;
+    querySelector(selectors: "param"): HTMLParamElement;
+    querySelector(selectors: "path"): SVGPathElement;
+    querySelector(selectors: "pattern"): SVGPatternElement;
+    querySelector(selectors: "picture"): HTMLPictureElement;
+    querySelector(selectors: "plaintext"): HTMLElement;
+    querySelector(selectors: "polygon"): SVGPolygonElement;
+    querySelector(selectors: "polyline"): SVGPolylineElement;
+    querySelector(selectors: "pre"): HTMLPreElement;
+    querySelector(selectors: "progress"): HTMLProgressElement;
+    querySelector(selectors: "q"): HTMLQuoteElement;
+    querySelector(selectors: "radialgradient"): SVGRadialGradientElement;
+    querySelector(selectors: "rect"): SVGRectElement;
+    querySelector(selectors: "rt"): HTMLElement;
+    querySelector(selectors: "ruby"): HTMLElement;
+    querySelector(selectors: "s"): HTMLElement;
+    querySelector(selectors: "samp"): HTMLElement;
+    querySelector(selectors: "script"): HTMLScriptElement;
+    querySelector(selectors: "section"): HTMLElement;
+    querySelector(selectors: "select"): HTMLSelectElement;
+    querySelector(selectors: "small"): HTMLElement;
+    querySelector(selectors: "source"): HTMLSourceElement;
+    querySelector(selectors: "span"): HTMLSpanElement;
+    querySelector(selectors: "stop"): SVGStopElement;
+    querySelector(selectors: "strike"): HTMLElement;
+    querySelector(selectors: "strong"): HTMLElement;
+    querySelector(selectors: "style"): HTMLStyleElement;
+    querySelector(selectors: "sub"): HTMLElement;
+    querySelector(selectors: "sup"): HTMLElement;
+    querySelector(selectors: "svg"): SVGSVGElement;
+    querySelector(selectors: "switch"): SVGSwitchElement;
+    querySelector(selectors: "symbol"): SVGSymbolElement;
+    querySelector(selectors: "table"): HTMLTableElement;
+    querySelector(selectors: "tbody"): HTMLTableSectionElement;
+    querySelector(selectors: "td"): HTMLTableDataCellElement;
+    querySelector(selectors: "template"): HTMLTemplateElement;
+    querySelector(selectors: "text"): SVGTextElement;
+    querySelector(selectors: "textpath"): SVGTextPathElement;
+    querySelector(selectors: "textarea"): HTMLTextAreaElement;
+    querySelector(selectors: "tfoot"): HTMLTableSectionElement;
+    querySelector(selectors: "th"): HTMLTableHeaderCellElement;
+    querySelector(selectors: "thead"): HTMLTableSectionElement;
+    querySelector(selectors: "title"): HTMLTitleElement;
+    querySelector(selectors: "tr"): HTMLTableRowElement;
+    querySelector(selectors: "track"): HTMLTrackElement;
+    querySelector(selectors: "tspan"): SVGTSpanElement;
+    querySelector(selectors: "tt"): HTMLElement;
+    querySelector(selectors: "u"): HTMLElement;
+    querySelector(selectors: "ul"): HTMLUListElement;
+    querySelector(selectors: "use"): SVGUseElement;
+    querySelector(selectors: "var"): HTMLElement;
+    querySelector(selectors: "video"): HTMLVideoElement;
+    querySelector(selectors: "view"): SVGViewElement;
+    querySelector(selectors: "wbr"): HTMLElement;
+    querySelector(selectors: "x-ms-webview"): MSHTMLWebViewElement;
+    querySelector(selectors: "xmp"): HTMLPreElement;
     querySelector(selectors: string): Element;
+    querySelectorAll(selectors: "a"): NodeListOf<HTMLAnchorElement>;
+    querySelectorAll(selectors: "abbr"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "acronym"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "address"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "applet"): NodeListOf<HTMLAppletElement>;
+    querySelectorAll(selectors: "area"): NodeListOf<HTMLAreaElement>;
+    querySelectorAll(selectors: "article"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "aside"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "audio"): NodeListOf<HTMLAudioElement>;
+    querySelectorAll(selectors: "b"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "base"): NodeListOf<HTMLBaseElement>;
+    querySelectorAll(selectors: "basefont"): NodeListOf<HTMLBaseFontElement>;
+    querySelectorAll(selectors: "bdo"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "big"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "blockquote"): NodeListOf<HTMLQuoteElement>;
+    querySelectorAll(selectors: "body"): NodeListOf<HTMLBodyElement>;
+    querySelectorAll(selectors: "br"): NodeListOf<HTMLBRElement>;
+    querySelectorAll(selectors: "button"): NodeListOf<HTMLButtonElement>;
+    querySelectorAll(selectors: "canvas"): NodeListOf<HTMLCanvasElement>;
+    querySelectorAll(selectors: "caption"): NodeListOf<HTMLTableCaptionElement>;
+    querySelectorAll(selectors: "center"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "circle"): NodeListOf<SVGCircleElement>;
+    querySelectorAll(selectors: "cite"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "clippath"): NodeListOf<SVGClipPathElement>;
+    querySelectorAll(selectors: "code"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "col"): NodeListOf<HTMLTableColElement>;
+    querySelectorAll(selectors: "colgroup"): NodeListOf<HTMLTableColElement>;
+    querySelectorAll(selectors: "datalist"): NodeListOf<HTMLDataListElement>;
+    querySelectorAll(selectors: "dd"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "defs"): NodeListOf<SVGDefsElement>;
+    querySelectorAll(selectors: "del"): NodeListOf<HTMLModElement>;
+    querySelectorAll(selectors: "desc"): NodeListOf<SVGDescElement>;
+    querySelectorAll(selectors: "dfn"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "dir"): NodeListOf<HTMLDirectoryElement>;
+    querySelectorAll(selectors: "div"): NodeListOf<HTMLDivElement>;
+    querySelectorAll(selectors: "dl"): NodeListOf<HTMLDListElement>;
+    querySelectorAll(selectors: "dt"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "ellipse"): NodeListOf<SVGEllipseElement>;
+    querySelectorAll(selectors: "em"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "embed"): NodeListOf<HTMLEmbedElement>;
+    querySelectorAll(selectors: "feblend"): NodeListOf<SVGFEBlendElement>;
+    querySelectorAll(selectors: "fecolormatrix"): NodeListOf<SVGFEColorMatrixElement>;
+    querySelectorAll(selectors: "fecomponenttransfer"): NodeListOf<SVGFEComponentTransferElement>;
+    querySelectorAll(selectors: "fecomposite"): NodeListOf<SVGFECompositeElement>;
+    querySelectorAll(selectors: "feconvolvematrix"): NodeListOf<SVGFEConvolveMatrixElement>;
+    querySelectorAll(selectors: "fediffuselighting"): NodeListOf<SVGFEDiffuseLightingElement>;
+    querySelectorAll(selectors: "fedisplacementmap"): NodeListOf<SVGFEDisplacementMapElement>;
+    querySelectorAll(selectors: "fedistantlight"): NodeListOf<SVGFEDistantLightElement>;
+    querySelectorAll(selectors: "feflood"): NodeListOf<SVGFEFloodElement>;
+    querySelectorAll(selectors: "fefunca"): NodeListOf<SVGFEFuncAElement>;
+    querySelectorAll(selectors: "fefuncb"): NodeListOf<SVGFEFuncBElement>;
+    querySelectorAll(selectors: "fefuncg"): NodeListOf<SVGFEFuncGElement>;
+    querySelectorAll(selectors: "fefuncr"): NodeListOf<SVGFEFuncRElement>;
+    querySelectorAll(selectors: "fegaussianblur"): NodeListOf<SVGFEGaussianBlurElement>;
+    querySelectorAll(selectors: "feimage"): NodeListOf<SVGFEImageElement>;
+    querySelectorAll(selectors: "femerge"): NodeListOf<SVGFEMergeElement>;
+    querySelectorAll(selectors: "femergenode"): NodeListOf<SVGFEMergeNodeElement>;
+    querySelectorAll(selectors: "femorphology"): NodeListOf<SVGFEMorphologyElement>;
+    querySelectorAll(selectors: "feoffset"): NodeListOf<SVGFEOffsetElement>;
+    querySelectorAll(selectors: "fepointlight"): NodeListOf<SVGFEPointLightElement>;
+    querySelectorAll(selectors: "fespecularlighting"): NodeListOf<SVGFESpecularLightingElement>;
+    querySelectorAll(selectors: "fespotlight"): NodeListOf<SVGFESpotLightElement>;
+    querySelectorAll(selectors: "fetile"): NodeListOf<SVGFETileElement>;
+    querySelectorAll(selectors: "feturbulence"): NodeListOf<SVGFETurbulenceElement>;
+    querySelectorAll(selectors: "fieldset"): NodeListOf<HTMLFieldSetElement>;
+    querySelectorAll(selectors: "figcaption"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "figure"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "filter"): NodeListOf<SVGFilterElement>;
+    querySelectorAll(selectors: "font"): NodeListOf<HTMLFontElement>;
+    querySelectorAll(selectors: "footer"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "foreignobject"): NodeListOf<SVGForeignObjectElement>;
+    querySelectorAll(selectors: "form"): NodeListOf<HTMLFormElement>;
+    querySelectorAll(selectors: "frame"): NodeListOf<HTMLFrameElement>;
+    querySelectorAll(selectors: "frameset"): NodeListOf<HTMLFrameSetElement>;
+    querySelectorAll(selectors: "g"): NodeListOf<SVGGElement>;
+    querySelectorAll(selectors: "h1"): NodeListOf<HTMLHeadingElement>;
+    querySelectorAll(selectors: "h2"): NodeListOf<HTMLHeadingElement>;
+    querySelectorAll(selectors: "h3"): NodeListOf<HTMLHeadingElement>;
+    querySelectorAll(selectors: "h4"): NodeListOf<HTMLHeadingElement>;
+    querySelectorAll(selectors: "h5"): NodeListOf<HTMLHeadingElement>;
+    querySelectorAll(selectors: "h6"): NodeListOf<HTMLHeadingElement>;
+    querySelectorAll(selectors: "head"): NodeListOf<HTMLHeadElement>;
+    querySelectorAll(selectors: "header"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "hgroup"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "hr"): NodeListOf<HTMLHRElement>;
+    querySelectorAll(selectors: "html"): NodeListOf<HTMLHtmlElement>;
+    querySelectorAll(selectors: "i"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "iframe"): NodeListOf<HTMLIFrameElement>;
+    querySelectorAll(selectors: "image"): NodeListOf<SVGImageElement>;
+    querySelectorAll(selectors: "img"): NodeListOf<HTMLImageElement>;
+    querySelectorAll(selectors: "input"): NodeListOf<HTMLInputElement>;
+    querySelectorAll(selectors: "ins"): NodeListOf<HTMLModElement>;
+    querySelectorAll(selectors: "isindex"): NodeListOf<HTMLUnknownElement>;
+    querySelectorAll(selectors: "kbd"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "keygen"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "label"): NodeListOf<HTMLLabelElement>;
+    querySelectorAll(selectors: "legend"): NodeListOf<HTMLLegendElement>;
+    querySelectorAll(selectors: "li"): NodeListOf<HTMLLIElement>;
+    querySelectorAll(selectors: "line"): NodeListOf<SVGLineElement>;
+    querySelectorAll(selectors: "lineargradient"): NodeListOf<SVGLinearGradientElement>;
+    querySelectorAll(selectors: "link"): NodeListOf<HTMLLinkElement>;
+    querySelectorAll(selectors: "listing"): NodeListOf<HTMLPreElement>;
+    querySelectorAll(selectors: "map"): NodeListOf<HTMLMapElement>;
+    querySelectorAll(selectors: "mark"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "marker"): NodeListOf<SVGMarkerElement>;
+    querySelectorAll(selectors: "marquee"): NodeListOf<HTMLMarqueeElement>;
+    querySelectorAll(selectors: "mask"): NodeListOf<SVGMaskElement>;
+    querySelectorAll(selectors: "menu"): NodeListOf<HTMLMenuElement>;
+    querySelectorAll(selectors: "meta"): NodeListOf<HTMLMetaElement>;
+    querySelectorAll(selectors: "metadata"): NodeListOf<SVGMetadataElement>;
+    querySelectorAll(selectors: "meter"): NodeListOf<HTMLMeterElement>;
+    querySelectorAll(selectors: "nav"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "nextid"): NodeListOf<HTMLUnknownElement>;
+    querySelectorAll(selectors: "nobr"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "noframes"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "noscript"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "object"): NodeListOf<HTMLObjectElement>;
+    querySelectorAll(selectors: "ol"): NodeListOf<HTMLOListElement>;
+    querySelectorAll(selectors: "optgroup"): NodeListOf<HTMLOptGroupElement>;
+    querySelectorAll(selectors: "option"): NodeListOf<HTMLOptionElement>;
+    querySelectorAll(selectors: "p"): NodeListOf<HTMLParagraphElement>;
+    querySelectorAll(selectors: "param"): NodeListOf<HTMLParamElement>;
+    querySelectorAll(selectors: "path"): NodeListOf<SVGPathElement>;
+    querySelectorAll(selectors: "pattern"): NodeListOf<SVGPatternElement>;
+    querySelectorAll(selectors: "picture"): NodeListOf<HTMLPictureElement>;
+    querySelectorAll(selectors: "plaintext"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "polygon"): NodeListOf<SVGPolygonElement>;
+    querySelectorAll(selectors: "polyline"): NodeListOf<SVGPolylineElement>;
+    querySelectorAll(selectors: "pre"): NodeListOf<HTMLPreElement>;
+    querySelectorAll(selectors: "progress"): NodeListOf<HTMLProgressElement>;
+    querySelectorAll(selectors: "q"): NodeListOf<HTMLQuoteElement>;
+    querySelectorAll(selectors: "radialgradient"): NodeListOf<SVGRadialGradientElement>;
+    querySelectorAll(selectors: "rect"): NodeListOf<SVGRectElement>;
+    querySelectorAll(selectors: "rt"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "ruby"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "s"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "samp"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "script"): NodeListOf<HTMLScriptElement>;
+    querySelectorAll(selectors: "section"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "select"): NodeListOf<HTMLSelectElement>;
+    querySelectorAll(selectors: "small"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "source"): NodeListOf<HTMLSourceElement>;
+    querySelectorAll(selectors: "span"): NodeListOf<HTMLSpanElement>;
+    querySelectorAll(selectors: "stop"): NodeListOf<SVGStopElement>;
+    querySelectorAll(selectors: "strike"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "strong"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "style"): NodeListOf<HTMLStyleElement>;
+    querySelectorAll(selectors: "sub"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "sup"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "svg"): NodeListOf<SVGSVGElement>;
+    querySelectorAll(selectors: "switch"): NodeListOf<SVGSwitchElement>;
+    querySelectorAll(selectors: "symbol"): NodeListOf<SVGSymbolElement>;
+    querySelectorAll(selectors: "table"): NodeListOf<HTMLTableElement>;
+    querySelectorAll(selectors: "tbody"): NodeListOf<HTMLTableSectionElement>;
+    querySelectorAll(selectors: "td"): NodeListOf<HTMLTableDataCellElement>;
+    querySelectorAll(selectors: "template"): NodeListOf<HTMLTemplateElement>;
+    querySelectorAll(selectors: "text"): NodeListOf<SVGTextElement>;
+    querySelectorAll(selectors: "textpath"): NodeListOf<SVGTextPathElement>;
+    querySelectorAll(selectors: "textarea"): NodeListOf<HTMLTextAreaElement>;
+    querySelectorAll(selectors: "tfoot"): NodeListOf<HTMLTableSectionElement>;
+    querySelectorAll(selectors: "th"): NodeListOf<HTMLTableHeaderCellElement>;
+    querySelectorAll(selectors: "thead"): NodeListOf<HTMLTableSectionElement>;
+    querySelectorAll(selectors: "title"): NodeListOf<HTMLTitleElement>;
+    querySelectorAll(selectors: "tr"): NodeListOf<HTMLTableRowElement>;
+    querySelectorAll(selectors: "track"): NodeListOf<HTMLTrackElement>;
+    querySelectorAll(selectors: "tspan"): NodeListOf<SVGTSpanElement>;
+    querySelectorAll(selectors: "tt"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "u"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "ul"): NodeListOf<HTMLUListElement>;
+    querySelectorAll(selectors: "use"): NodeListOf<SVGUseElement>;
+    querySelectorAll(selectors: "var"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "video"): NodeListOf<HTMLVideoElement>;
+    querySelectorAll(selectors: "view"): NodeListOf<SVGViewElement>;
+    querySelectorAll(selectors: "wbr"): NodeListOf<HTMLElement>;
+    querySelectorAll(selectors: "x-ms-webview"): NodeListOf<MSHTMLWebViewElement>;
+    querySelectorAll(selectors: "xmp"): NodeListOf<HTMLPreElement>;
     querySelectorAll(selectors: string): NodeListOf<Element>;
 }
 
diff --git a/inputfiles/overridingTypes.json b/inputfiles/overridingTypes.json
index 1d22f0214..e0df0ff46 100644
--- a/inputfiles/overridingTypes.json
+++ b/inputfiles/overridingTypes.json
@@ -104,12 +104,6 @@
         "name": "msElementsFromPoint",
         "signatures": ["msElementsFromPoint(x: number, y: number): NodeListOf<Element>"]
     },
-    {
-        "kind": "method",
-        "interface": "NodeSelector",
-        "name": "querySelectorAll",
-        "signatures": ["querySelectorAll(selectors: string): NodeListOf<Element>"]
-    },
     {
         "kind": "method",
         "name": "getElementsByTagNameNS",