Merge pull request #28 from ndm2/master

Remove surrogates range from regex for "display", "url" and "class" mode...
Allow model id to be used
cs via phpcs-fixer
cs via phpcs-fixer autocorrection
cs
cs
fix accidental revert.
more cs