Fixed other redirect issues
Merge branch 'master' into feature/infinite-scroll