Fixing 2 bugs in the Infinite Scroll feature

nicely reported by https://github.com/popcorn-time/popcorn-app/issues/391