Fix data has not been fetching when in the root url
Merge branch 'master' into production