Add live search back in. Also remove global listner for ESC