Code work-around for broken ES regular expressions

Fix #2 - Broken ES regular expression match causes numeric layer renames to fail.