Fixing regexp for layer type extraction from context