changed location string to the same layout as on the start page
Merge branch 'stable'