- Code review: improved search API, tidied up the search related code,
  and fixed a tiny bug when searching for users.