Fixed issue with user message not showing when no relationships are present
include short names in search string
Merge branch 'develop'