diff --git a/app/helpers/feed_helper.rb b/app/helpers/feed_helper.rb
index bc7c5c6..073d55e 100644
--- a/app/helpers/feed_helper.rb
+++ b/app/helpers/feed_helper.rb
@@ -103,9 +103,7 @@ module FeedHelper
   # get the time floored to the correct number of seconds
   def get_floored_time(input_time, seconds)
     floored_seconds = (input_time.to_f / seconds).floor * seconds
-    # offset the seconds by the current time zone offset
-    offset_seconds = Time.zone.now.utc_offset
-    return Time.at(floored_seconds - offset_seconds)
+    return Time.at(floored_seconds)
   end
 
   # slice feed into timescales
diff --git a/app/models/feed_factory.rb b/app/models/feed_factory.rb
index ee2d7f0..5a8796a 100644
--- a/app/models/feed_factory.rb
+++ b/app/models/feed_factory.rb
@@ -32,7 +32,7 @@ class FeedFactory < ApplicationController
   # calculate the limit that should be used
   def calculate_limit
     limit = 100
-    limit = 8000 if @options[:results].present? || @options[:days].present? || @options[:start].present? || @options[:end].present?
+    limit = 8000 if @options[:results].present? || @options[:days].present? || @options[:start].present? || @options[:end].present? || @options[:start_entry_id] || @options[:end_entry_id]
     limit = @options[:results].to_i if (@options[:results].present? && @options[:results].to_i < 8000)
     return limit
   end