Changed “user_handles” to “user_query” for consistency.
Merge remote-tracking branch 'origin/master' into back-end-working