queries changed as per new column names