some more logic to handle unicode changes -- backwards compatibility ( need to start over and just re-import data )