RESTWS-307: Avoid concatenating fields in display property
RESTWS-307: Follow up fixes