Refactored more eager loading, of all gallery assets