XLCLOUD-2082 Fixed issues with some content not being masked.