Address CR, fix filters functionality with SAMPLE update