bug fix
add support match/expand vector
remove redundunt code