Two patches: * Feeds should now load the right amount of events initially and per 'load-more' chunk * An annotate that is cancelled should not get stuck making the next reply an annotate