Optimize and add assembly for expand filter
Improve assembly readability