More query eval work