Fixing 2 bugs in the Infinite Scroll feature

Fix the two first issues nicely reported by https://github.com/popcorn-time/popcorn-app/issues/391
The last issue is fixed in https://github.com/popcorn-time/popcorn-app/pull/396