More query fields, authorization check