shall identify areas which are described in clause (i). . (e) Elimination of certain lodging restrictions on buildings other than certified historic structures Section 50(b)(2)(C) of such Code is amended by striking certified historic structure and inserting qualified rehabilitated building . (f) Requirement that buildings that are not certified historic structures and not in a registered historic district receive certification of status Section 47(c)(1) of such Code, as amended by subsections (a) and (d), is amended by redesignating subparagraphs (D) and (E) as subparagraphs (E) and (F), respectively, and by inserting after subparagraph (C) the following new subparagraph: (D) Buildings that are not certified historic structures and not in registered historic district must receive certification of status (i) In general In the case of a building which is neither a certified historic structure nor located in a registered historic district, such building shall not be a qualified rehabilitated building unless the Secretary of the Interior certifies to the Secretary that such building is— (I) not a certified historic structure, and (II) not in a registered historic district. (ii) Determinations by National Park Service To the maximum extent practicable, the Secretary of the Interior shall make certifications under clause (i) within 30 days of the receipt of an application for such certification. . (g) Credit for certain related expenditures (1) Credit for certain expenditures for public infrastructure Section 47(c)(2) of such Code is amended by adding at the end the following new subparagraph: (E) Treatment of certain expenditures for public infrastructure (i) In general In the case of any qualified rehabilitated building, expenditures for qualified public infrastructure (or improvements thereto) shall be treated for purposes of this section as qualified rehabilitation expenditures with respect to such building if providing such qualified public infrastructure is related to such building and is required by any State