Review and fix attribute validation

[jgoizueta]

See #639. This problem of slow attribute validation with aggregations required some quick fix, but we should review the issue again to see if a better solution is needed.