Searches now stop properly