updates to handle special characters