[BUGFIX] Only parse if typenum is 0 and regex improvement