Broke out regex for debug.
Updated to include data restriction.
Cleaned up regex structure for future analysis / improvement.
Updated changelog and version number
Merge branch 'hotfix/data-regex-fix'