Upgrade regexp for minify and concat