Fix nested statuses for given/on