Fix error when viewing page without specifying language (use default)
Merge branch 'develop' into perf