diff --git a/dm-pager.gemspec b/dm-pager.gemspec
index ac1910f..ecbb538 100644
--- a/dm-pager.gemspec
+++ b/dm-pager.gemspec
@@ -22,20 +22,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.1.0"])
-      s.add_runtime_dependency(%q<dm-aggregates>, ["~> 1.1.0"])
-      s.add_development_dependency(%q<dm-migrations>, ["~> 1.1.0"])
-      s.add_development_dependency(%q<dm-sqlite-adapter>, ["~> 1.1.0"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.2.0"])
+      s.add_runtime_dependency(%q<dm-aggregates>, ["~> 1.2.0"])
+      s.add_development_dependency(%q<dm-migrations>, ["~> 1.2.0"])
+      s.add_development_dependency(%q<dm-sqlite-adapter>, ["~> 1.2.0"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.1.0"])
-      s.add_dependency(%q<dm-aggregates>, ["~> 1.1.0"])
-      s.add_dependency(%q<dm-migrations>, ["~> 1.1.0"])
-      s.add_dependency(%q<dm-sqlite-adapter>, ["~> 1.1.0"])
+      s.add_dependency(%q<dm-core>, ["~> 1.2.0"])
+      s.add_dependency(%q<dm-aggregates>, ["~> 1.2.0"])
+      s.add_dependency(%q<dm-migrations>, ["~> 1.2.0"])
+      s.add_dependency(%q<dm-sqlite-adapter>, ["~> 1.2.0"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.1.0"])
-    s.add_dependency(%q<dm-aggregates>, ["~> 1.1.0"])
-    s.add_dependency(%q<dm-migrations>, ["~> 1.1.0"])
-    s.add_dependency(%q<dm-sqlite-adapter>, ["~> 1.1.0"])
+    s.add_dependency(%q<dm-core>, ["~> 1.2.0"])
+    s.add_dependency(%q<dm-aggregates>, ["~> 1.2.0"])
+    s.add_dependency(%q<dm-migrations>, ["~> 1.2.0"])
+    s.add_dependency(%q<dm-sqlite-adapter>, ["~> 1.2.0"])
   end
 end
diff --git a/lib/dm-pager/helpers/rails.rb b/lib/dm-pager/helpers/rails.rb
index d0aa6f8..3139e44 100644
--- a/lib/dm-pager/helpers/rails.rb
+++ b/lib/dm-pager/helpers/rails.rb
@@ -10,8 +10,8 @@ module DataMapper::Pagination::Helpers::Rails
   #   :size    Number of intermediate page number links to be shown; Defaults to 7
   
   def paginate collection, options = {}
-    uri = @template.url_for @template.params.merge(options[:params] || {})
-    collection.pager.to_html uri, options
+    uri = url_for params.merge(options[:params] || {})
+    collection.pager.to_html(uri, options).to_s.html_safe
   end
 
-end
\ No newline at end of file
+end
diff --git a/lib/dm-pager/pagination.rb b/lib/dm-pager/pagination.rb
index be3cf40..74794f2 100644
--- a/lib/dm-pager/pagination.rb
+++ b/lib/dm-pager/pagination.rb
@@ -41,9 +41,7 @@ def page page = nil, options = {}
       collection = new_collection scoped_query(options = {
         :limit => per_page,
         :offset => (page - 1) * per_page,
-        :order => [:id.desc]
       }.merge(query))
-      query.delete :order
       options.merge! :total => count(query), page_param => page, :page_param => page_param
       collection.pager = DataMapper::Pager.new options
       collection