[TASK] Simplify uid/WHERE decision in ContentService