Handled special chars and added some logging