Updated the user search API, not entirely happy with it, trying to have 3: user info, admin search by id, admin search by username, so the :id and :username annotation collided