Add additional search by user or group and extra user fields in social search - refs #7344

It would be better to put the "else {" on th same line as the "}" above