Data refactor. String processing removed, data for google on JS side