Show user name properly
More search fixes