; sunset. Sec. 512. Severability; applicability date. 2. Amendments to the Foreign Intelligence Surveillance Act of 1978 (a) References to Foreign Intelligence Surveillance Act of 1978 Except as otherwise expressly provided, whenever in this Act an amendment or repeal is expressed in terms of an amendment to, or a repeal of, a section or other provision, the reference shall be considered to be made to a section or other provision of the Foreign Intelligence Surveillance Act of 1978 ( 50 U.S.C. 1801 et seq. ). (b) Effect of certain amendments on conforming changes to tables of contents When an amendment made by this Act adds a section or larger organizational unit to the Foreign Intelligence Surveillance Act of 1978 ( 50 U.S.C. 1801 et seq. ), repeals or transfers a section or larger organizational unit in such Act, or amends the designation or heading of a section or larger organizational unit in such Act, that amendment also shall have the effect of amending the table of contents in such Act to alter the table to conform to the changes made by the amendment. I RESTRICTION ON FEDERAL BUREAU OF INVESTIGATION QUERIES 101. Revoking Federal Bureau of Investigation authority to conduct queries unrelated to national security Subsection (f)(2) of section 702 is amended to read as follows: (2) Prohibition on conduct of queries that are solely designed to find and extract evidence of a crime (A) Limits on authorizations of United States person queries The querying procedures adopted pursuant to paragraph (1) for the Federal Bureau of Investigation shall prohibit queries of information acquired under subsection (a) that are solely designed to find and extract evidence of criminal activity. (B) Exceptions The restriction under subparagraph (A) shall not apply with respect to a query if— (i) there is a reasonable belief that such query may retrieve information that could assist in mitigating or eliminating a threat to life or serious bodily harm