fix issue and improve feature
fix regex parse issue