Made changes to support special characters, not working yet.
Made changes to support special characters, not working yet.