Improve user matching
Fixing feed messages.