Re: FR1 -> FR2: authenticate_query