Better regex for entities