Fix user search, cleanup