SOC: Fixing schedule adapter filter, filter state