bugfix - regex pattern for keyed mapping support