; and (2) that the surrender, removal, and storage of firearms and ammunition from persons prohibited from possessing firearms under paragraphs (8) or (9) of section 922(g) of title 18, United States Code, State law, tribal law, or local ordinance, is carried out in a manner to ensure victim and community safety. 2018. Grant eligibility regarding law enforcement improvement of community safety In order to be eligible for grants under this subchapter, a State, Indian tribal government, territorial government, or unit of local government shall certify that, not later than March 7, 2022, their laws, policies, or practices will include a detailed protocol regarding the surrender, removal and storage of firearms and ammunition from persons prohibited from possessing firearms or ammunition under paragraph (8) or (9) of section 922 of title 18, United States Code, or under State law, tribal law, or local posted ordinance. . (b) Authorization of appropriations Section 1001(a)(18) of the Omnibus Crime Control and Safe Streets Act of 1968 ( 34 U.S.C. 10261(a)(18) ) is amended by striking 2014 through 2018 and inserting 2019 through 2023 . 102. Grants to improve the criminal justice response (a) In general Section 2101 of the Omnibus Crime Control and Safe Streets Act of 1968 ( 34 U.S.C. 10461 ) is amended— (1) in subsection (b)— (A) in paragraph (1), by striking proarrest and inserting offender accountability and homicide reduction ; (B) in paragraph (8)— (i) by inserting after instances of the following: abuse in later life, ; (ii) by striking older individuals (as defined in section 102 of the Older Americans Act of 1965 ( 42 U.S.C. 3002 )) and inserting people 50 years of age or over ; and (iii) by striking individuals with disabilities (as defined in section 3(2) of the Americans with Disabilities Act of 1990 ( 42 U.S.C. 12102(2) )) and inserting people with disabilities (as defined in section 3(2) of the Americans with Disabilities Act of 1990 ( 42 U.S.C. 12102(2) ))