Update to clearToolbar

stream line of code to build the filter and sdata object in one pass instead of two.