Don't display NULL if there is no search_name set
Merge branch 'develop'