update to handle special  characters