Better regex for more hugtracking accuracy