fixed search logic shot