Fixed column naming issue in queries.