DATA-2105

Fixed duplicated keys and added pre tags