Updated to findOneById user lookup