improve precision of the mapping.properties clean up search in the
builder