Finish refactoring user endpoints to use query builder