fix tag, removelistener issue
optional from match