Changed feed and feed entry queries to allow for the 'super stream'