add loading to stream and enhance behaviour of load more
Merge pull request #585 from ndomar/bug_fixes

Bug fixes