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

Better one line up (with the "}")