[SD-1157] remove the filter and using expression instead.