Fix bug in handler when search deadline