[Modify] Update finding of HeadHandler.