Improve attribute/value selection