More query changes