; (ii) in paragraph (2)— (I) in subparagraph (A), by striking with subsection (g) and inserting with subsection (h) ; and (II) by adding at the end the following: (D) Querying procedures The querying procedures adopted in accordance with subsection (f)(1) to assess whether such procedures comply with the requirements of such subsection. ; (iii) in paragraph (3)— (I) in subparagraph (A)— (aa) by striking with subsection (g) and inserting with subsection (h) ; and (bb) by striking targeting and minimization procedures adopted in accordance with subsections (d) and (e) and inserting targeting, minimization, and querying procedures adopted in accordance with subsections (d), (e), and (f)(1) ; and (II) in subparagraph (B), in the matter before clause (i)— (aa) by striking with subsection (g) and inserting with subsection (h) ; and (bb) by striking with subsections (d) and (e) and inserting with subsections (d), (e), and (f)(1) ; and (iv) in paragraph (5)(A)— (I) by striking with subsection (g) and inserting with subsection (h) ; and (II) by striking with subsections (d) and (e) and inserting with subsections (d), (e), and (f)(1) ; and (G) in subsection (m), as redesignated by subsection (a)(1)— (i) in paragraph (1), in the matter before subparagraph (A)— (I) by striking targeting and minimization procedures adopted in accordance with subsections (d) and (e) and inserting targeting, minimization, and querying procedures adopted in accordance with subsections (d), (e), and (f)(1) ; and (II) by striking with subsection (f) and inserting with subsection (g) ; and (ii) in paragraph (2)(A)— (I) by striking targeting and minimization procedures adopted in accordance with subsections (d) and (e) and inserting targeting, minimization, and querying procedures adopted in accordance with subsections (d), (e), and (f)(1)