diff --git a/src/rust-css b/src/rust-css
index e3d3a5d65de..a52c721657c 160000
--- a/src/rust-css
+++ b/src/rust-css
@@ -1 +1 @@
-Subproject commit e3d3a5d65ded9afc69a9033a5a8e609a88527476
+Subproject commit a52c721657cf6ea7b76ddbd4787bf8590978c365
diff --git a/src/servo/css/select_handler.rs b/src/servo/css/select_handler.rs
index 918891c187b..0b48e08a5df 100644
--- a/src/servo/css/select_handler.rs
+++ b/src/servo/css/select_handler.rs
@@ -1,10 +1,24 @@
-use dom::node::Node;
+use dom::node::{Node, Doctype, Comment, Element, Text};
 use newcss::SelectHandler;
 
 pub struct NodeSelectHandler {
     node: Node
 }
 
+/// Placeholder names
+fn unnamed_node(name: &str) -> ~str {
+    fmt!("unnamed-%s", name)
+}
+
 impl NodeSelectHandler: SelectHandler<Node> {
-    
+    fn node_name(node: &Node) -> ~str {
+        do node.read |data| {
+            match *data.kind {
+                Doctype(*) => unnamed_node("doctype"),
+                Comment(*) => unnamed_node("comment"),
+                Element(ref data) => copy data.tag_name,
+                Text(*) => unnamed_node("text")
+            }
+        }
+    }
 }
\ No newline at end of file