gunShot searching improvements