Updated users, edited search functionality