Updated regex to support additional matching schemes (3x03, 3x03-3x04, 3x03x04)