more eagerload improvements