Improvment to attributes default selection.