fixed query column naming conventions