Fix searches not firing correctly