Small fixes
Update query to use new column name