Update SI to use workaroung for filtering