Fix MMP-1201 by translating regex's to SOQL