Fixed HPD-37 issue.

Dataset now shows attributes that are linked.
Attribute search filter is fixed.
Merge remote-tracking branch 'origin/develop-HPD-37' into develop