Prototype Panel + minor regex fix