Fixed problem with pagination if API call fails
Merge branch 'development' into refactor-load-more-functionality