Item13066: update expand to expandValue in checkers