Revise and relocate the recognizer stop and restart event