diff --git a/html-pipeline.gemspec b/html-pipeline.gemspec
index ec1b5225..c8425b6f 100644
--- a/html-pipeline.gemspec
+++ b/html-pipeline.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^test})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "nokogiri", [">= 1.4", "<= 1.6.5"]
+  gem.add_dependency "nokogiri", ">= 1.4"
   gem.add_dependency "activesupport", [">= 2", "< 5"]
 
   gem.post_install_message = <<msg
diff --git a/lib/html/pipeline/@mention_filter.rb b/lib/html/pipeline/@mention_filter.rb
index 3d4ded7c..0b0d3b77 100644
--- a/lib/html/pipeline/@mention_filter.rb
+++ b/lib/html/pipeline/@mention_filter.rb
@@ -70,7 +70,7 @@ def self.mentioned_logins_in(text, username_pattern=UsernamePattern)
       def call
         result[:mentioned_usernames] ||= []
 
-        doc.search('text()').each do |node|
+        doc.search('.//text()').each do |node|
           content = node.to_html
           next if !content.include?('@')
           next if has_ancestor?(node, IGNORE_PARENTS)
diff --git a/lib/html/pipeline/emoji_filter.rb b/lib/html/pipeline/emoji_filter.rb
index 390246ce..36e6bc3b 100644
--- a/lib/html/pipeline/emoji_filter.rb
+++ b/lib/html/pipeline/emoji_filter.rb
@@ -19,7 +19,7 @@ class EmojiFilter < Filter
       DEFAULT_IGNORED_ANCESTOR_TAGS = %w(pre code tt).freeze
 
       def call
-        doc.search('text()').each do |node|
+        doc.search('.//text()').each do |node|
           content = node.to_html
           next unless content.include?(':')
           next if has_ancestor?(node, ignored_ancestor_tags)