fixed bugs: incorrect table and column names