LPS-47725

LPS-47725 Escape only specific fields