changes for handling special chars