Code Changes
Output template (Search for a single user)
Minor api changes