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

This should be on 3 different lines