add handling for special chars