Corrections to regex for reading big entities

The regex to read entities has been split into 2 small regex. The arguments are no longer read by a regex, they are just extracted from a string.