--- location_cck.module.orig	2009-12-29 14:02:22.000000000 -0800
+++ location_cck.module	2009-12-30 20:09:58.000000000 -0800
@@ -425,6 +425,7 @@ function location_cck_token_list($type =
     unset($fields['locpick']);
     foreach ($fields as $k => $v) {
       $tokens['location'][$k] = $v;
+      $tokens['location'][$k .'-raw'] = $v . ' WARNING - raw user input.';
     }
 
     return $tokens;
@@ -458,6 +459,7 @@ function location_cck_token_values($type
       foreach ($fields as $k => $v) {
         if (isset($location[$k])) {
           $tokens[$k] = $location[$k];
+          $token_values[$k . '-raw'] = html_entity_decode($location[$k],ENT_QUOTES);
         }
         else {
           $tokens[$k] = '';