Prep for query_reviewer support