[Han] update helpers to fix regex issues in pre6