various modification towards the nokogiri integration