better regex in mapper