diff --git a/ruby/lib/jam_ruby/models/jam_track.rb b/ruby/lib/jam_ruby/models/jam_track.rb
index 49dfcd4b5..1301c03bf 100644
--- a/ruby/lib/jam_ruby/models/jam_track.rb
+++ b/ruby/lib/jam_ruby/models/jam_track.rb
@@ -69,8 +69,16 @@ module JamRuby
           page = options[:page].to_i
           per_page = options[:per_page].to_i
 
+          if per_page == 0
+            # try and see if limit was specified
+            limit = options[:limit]
+            limit ||= 20
+            limit = limit.to_i
+          else
+            limit = per_page
+          end
+
           start = (page -1 )* per_page
-          limit = per_page
         else
           limit = options[:limit]
           limit ||= 20
diff --git a/web/app/assets/javascripts/jamtrack.js b/web/app/assets/javascripts/jamtrack.js
index 57371b79e..99bab2960 100644
--- a/web/app/assets/javascripts/jamtrack.js
+++ b/web/app/assets/javascripts/jamtrack.js
@@ -63,7 +63,7 @@
     }
 
     function defaultQuery() {
-      var query = { limit:LIMIT, page:currentPage};
+      var query = { per_page:LIMIT, page:currentPage + 1};
 
       if(next) {
         query.since = next;