CAAERS-6618 handle special characters