Fixed DB column name issues