DS-2108 Improve the ordering method of the results
DS-2108 templates.js was interfering with google-stats-dates.js, so move the latter