Replace double quotes with single on __pattern__
Fix some container __pattern__