[TASK] Adapt resolving Providers when $row is empty