Change units to unit in table calls