Correct client retrieval query
Correct user matching
Remove listener calls out of run loop