Person, Weapon, Vehicle search added