Improve user matching