Flesh out joinWithQuery for HasOneOrMany