MB-135 #Fixed column names that conflicted with SQL commands