Improve SingleValueFilterModel