MSS-12 replace dashes with underscores before cdbid (for easier regex)