fixed regexes for rollups