Fix browser data built many time by datalayer