Moved mapper.  Fixed table column escaping