GTNPORTAL-2770 Update missing cases of non-characters removal