Refactored Content Update Grid / Moved content table join in resource collection