ATLAS-3591: Improve user-defined attributes search
2 files changed