step 5 : fix columns with table identifier