It looks good to me. Though I don't understand the above change. I was thinking that sanitization only occured in getView2DState.