Cleaned the codes. Refs #8685.
Merge branch 'feature/8685_matrixws_filter' into develop