Fix double search problem